changeset 16629:a1ca6778da49 v8.1.1317

patch 8.1.1317: output from Travis can be improved commit https://github.com/vim/vim/commit/dc9f9e93f5229fd4325472ed62e7b17872d64060 Author: Bram Moolenaar <Bram@vim.org> Date: Sat May 11 14:34:13 2019 +0200 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 https://github.com/vim/vim/issues/4098)
author Bram Moolenaar <Bram@vim.org>
date Sat, 11 May 2019 14:45:04 +0200
parents be59853d0848
children 0d3d8c26a40f
files .travis.yml configure src/version.c
diffstat 3 files changed, 15 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/.travis.yml
+++ b/.travis.yml
@@ -130,6 +130,8 @@ before_script:
 
 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 @@ script:
     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 @@ script:
       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:
--- 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 "$@"
--- a/src/version.c
+++ b/src/version.c
@@ -768,6 +768,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1317,
+/**/
     1316,
 /**/
     1315,