aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-29 04:34:16 -04:00
Code Activity

patch 8.2.1279: some tests on Travis have EXITFREE duplicated

Browse Source 
Problem:    Some tests on Travis have EXITFREE duplicated.
Solution:   Remove EXITFREE from shadowopt.  Add "shadow" to job name.
This commit is contained in:
Bram Moolenaar
2020-07-23 15:50:40 +02:00
parent dd1a9af00f
commit 8d5f6af5e5
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@@ -22,7 +22,7 @@ _anchors:
SANITIZER_CFLAGS="-g -O1 -DABORT_ON_INTERNAL_ERROR -DEXITFREE -fsanitize=address -fno-omit-frame-pointer" 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" ASAN_OPTIONS="print_stacktrace=1 log_path=asan" LSAN_OPTIONS="suppressions=$TRAVIS_BUILD_DIR/src/testdir/lsan-suppress.txt"
- &shadowopt - &shadowopt
LEAK_CFLAGS="-DEXITFREE" SHADOWOPT="-C src/shadow" SRCDIR=./src/shadow SHADOWOPT="-C src/shadow" SRCDIR=./src/shadow
linux: &linux linux: &linux
os: linux os: linux
@@ -191,13 +191,13 @@ jobs:
compiler: gcc compiler: gcc
env: *small env: *small
- <<: *linux - <<: *linux
name: normal/clang name: normal+shadow/clang
compiler: clang compiler: clang
env: env:
- *normal - *normal
- *shadowopt - *shadowopt
- <<: *linux - <<: *linux
name: normal/gcc name: normal+shadow/gcc
compiler: gcc compiler: gcc
env: env:
- *normal - *normal

2
src/version.c
View File

@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1279,
/**/ /**/
1278, 1278,
/**/ /**/