patch 8.1.1317: output from Travis can be improved
Problem: Output from Travis can be improved.
Solution: Add section headers. Handle errors better. (closes #4098)
diff --git a/.travis.yml b/.travis.yml
index d683b13..1e5ee56 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -130,6 +130,8 @@
script:
- NPROC=$(getconf _NPROCESSORS_ONLN)
+ - set -o errexit
+ - echo -e "\\033[33;1mConfiguring Vim\\033[0m" && echo -en "travis_fold:start:configure\\r\\033[0K"
- |
if [[ "${CHECK_AUTOCONF}" = "yes" ]] && [[ "${CC}" = "gcc" ]]; then
make -C src autoconf
@@ -138,13 +140,17 @@
if [[ -n "${SHADOWOPT}" ]]; then
make -C src shadow
fi
+ # "./configure" changes its working directory into "$SRCDIR".
+ - ./configure --with-features=${FEATURES} ${CONFOPT} --enable-fail-if-missing
+ - echo -en "travis_fold:end:configure\\r\\033[0K"
+ - echo -e "\\033[33;1mBuilding Vim\\033[0m" && echo -en "travis_fold:start:build\\r\\033[0K"
- |
- (
- cd "${SRCDIR}" \
- && ./configure --with-features=${FEATURES} ${CONFOPT} --enable-fail-if-missing
- ) && if [[ "${BUILD}" = "yes" ]]; then
+ if [[ "${BUILD}" = "yes" ]]; then
make ${SHADOWOPT} -j${NPROC}
fi
+ - echo -en "travis_fold:end:build\\r\\033[0K"
+ - set +o errexit
+ - echo -e "\\033[33;1mTesting Vim\\033[0m" && echo -en "travis_fold:start:test\\r\\033[0K"
# Show Vim version and also if_xx versions.
- |
if [[ "${BUILD}" = "yes" ]]; then
@@ -154,12 +160,13 @@
cat if_ver.txt
fi
- make ${SHADOWOPT} ${TEST}
+ - echo -en "travis_fold:end:test\\r\\033[0K"
- |
if [[ -n "${ASAN_OPTIONS}" ]]; then
while read log; do
asan_symbolize < "${log}"
+ false # exit 1 if there are ASAN logs
done < <(find . -type f -name 'asan.*' -size +0)
- [[ -z "${log}" ]] # exit 1 if there are ASAN logs
fi
after_success:
diff --git a/configure b/configure
index 1d0c5b2..d9d99c6 100755
--- a/configure
+++ b/configure
@@ -3,4 +3,4 @@
# This is just a stub for the Unix configure script, to provide support for
# doing "./configure" in the top Vim directory.
-cd src && exec ./configure "$@"
+cd "${SRCDIR:-src}" && exec ./configure "$@"
diff --git a/src/version.c b/src/version.c
index d31e611..ea97bef 100644
--- a/src/version.c
+++ b/src/version.c
@@ -768,6 +768,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1317,
+/**/
1316,
/**/
1315,