# HG changeset patch # User Bram Moolenaar # Date 1567599303 -7200 # Node ID 3504cf2c80a8d50ef217a1c31095d25ec1f508d1 # Parent bfe4abf3a8ba0b18e84b70960b9204d89d935870 patch 8.1.1976: Travis log always shows test output Commit: https://github.com/vim/vim/commit/2b43f7f9f482b845916d308ec4a9dff2ad20e3ec Author: Bram Moolenaar 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) diff --git a/.travis.yml b/.travis.yml --- 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), diff --git a/src/version.c b/src/version.c --- 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,