To: vim_dev@googlegroups.com Subject: Patch 8.2.1279 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.1279 Problem: Some tests on Travis have EXITFREE duplicated. Solution: Remove EXITFREE from shadowopt. Add "shadow" to job name. Files: .travis.yml *** ../vim-8.2.1278/.travis.yml 2020-07-23 14:59:03.788539127 +0200 --- .travis.yml 2020-07-23 15:50:06.411887124 +0200 *************** *** 22,28 **** SANITIZER_CFLAGS="-g -O1 -DABORT_ON_INTERNAL_ERROR -DEXITFREE -fsanitize=address -fno-omit-frame-pointer" ASAN_OPTIONS="print_stacktrace=1 log_path=asan" LSAN_OPTIONS="suppressions=$TRAVIS_BUILD_DIR/src/testdir/lsan-suppress.txt" - &shadowopt ! LEAK_CFLAGS="-DEXITFREE" SHADOWOPT="-C src/shadow" SRCDIR=./src/shadow linux: &linux os: linux --- 22,28 ---- SANITIZER_CFLAGS="-g -O1 -DABORT_ON_INTERNAL_ERROR -DEXITFREE -fsanitize=address -fno-omit-frame-pointer" ASAN_OPTIONS="print_stacktrace=1 log_path=asan" LSAN_OPTIONS="suppressions=$TRAVIS_BUILD_DIR/src/testdir/lsan-suppress.txt" - &shadowopt ! SHADOWOPT="-C src/shadow" SRCDIR=./src/shadow linux: &linux os: linux *************** *** 191,203 **** compiler: gcc env: *small - <<: *linux ! name: normal/clang compiler: clang env: - *normal - *shadowopt - <<: *linux ! name: normal/gcc compiler: gcc env: - *normal --- 191,203 ---- compiler: gcc env: *small - <<: *linux ! name: normal+shadow/clang compiler: clang env: - *normal - *shadowopt - <<: *linux ! name: normal+shadow/gcc compiler: gcc env: - *normal *** ../vim-8.2.1278/src/version.c 2020-07-23 15:37:59.331156413 +0200 --- src/version.c 2020-07-23 15:50:24.751744929 +0200 *************** *** 756,757 **** --- 756,759 ---- { /* Add new patch number below this line */ + /**/ + 1279, /**/ -- hundred-and-one symptoms of being an internet addict: 69. Yahoo welcomes you with your own start page /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///