diff options
author | Bram Moolenaar <Bram@vim.org> | 2019-09-04 14:11:16 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2019-09-04 14:11:16 +0200 |
commit | 2b43f7f9f482b845916d308ec4a9dff2ad20e3ec (patch) | |
tree | 22911543d35a61119685278419d0556e20a6a370 | |
parent | 89c00033310a1cad89efd2a7fc873f8969dd4401 (diff) | |
download | vim-git-2b43f7f9f482b845916d308ec4a9dff2ad20e3ec.tar.gz |
patch 8.1.1976: Travis log always shows test outputv8.1.1976
Problem: Travis log always shows test output.
Solution: Change script to avoid if/else. (Ozaki Kiichi, closes #4892)
-rw-r--r-- | .travis.yml | 8 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 9c184f388..4625bcf9d 100644 --- 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 index 191e10166..9286ec8c5 100644 --- 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, |