Mercurial > vim

changeset 17960:3504cf2c80a8 v8.1.1976

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.1976: Travis log always shows test output Commit: https://github.com/vim/vim/commit/2b43f7f9f482b845916d308ec4a9dff2ad20e3ec Author: Bram Moolenaar <Bram@vim.org> Date: Wed Sep 4 14:11:16 2019 +0200 patch 8.1.1976: Travis log always shows test output Problem: Travis log always shows test output. Solution: Change script to avoid if/else. (Ozaki Kiichi, closes https://github.com/vim/vim/issues/4892)
author Bram Moolenaar <Bram@vim.org>
date Wed, 04 Sep 2019 14:15:03 +0200
parents bfe4abf3a8ba
children aa9b5f329f97
files .travis.yml src/version.c
diffstat 2 files changed, 4 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/.travis.yml
+++ b/.travis.yml
@@ -142,12 +142,8 @@ script:
       "${SRCDIR}"/vim --not-a-term -u NONE -S "${SRCDIR}"/testdir/if_ver-2.vim -c quit > /dev/null
       cat if_ver.txt
     fi
-  - |
-    if do_test make ${SHADOWOPT} ${TEST}; then
-      echo -en "travis_fold:end:test\\r\\033[0K"
-    else
-      exit 1
-    fi
+  - do_test make ${SHADOWOPT} ${TEST} && FOLD_MARKER=travis_fold
+  - echo -en "${FOLD_MARKER}:end:test\\r\\033[0K"
 
 
 # instead of a 2*2*8 matrix (2*os + 2*compiler + 8*env),
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1976,
+/**/
     1975,
 /**/
     1974,