diff options
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 1f71d51ca..0f9aeafcd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ _anchors: 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 + SHADOWOPT="-C src/shadow" SRCDIR=./src/shadow linux: &linux os: linux @@ -191,13 +191,13 @@ jobs: compiler: gcc env: *small - <<: *linux - name: normal/clang + name: normal+shadow/clang compiler: clang env: - *normal - *shadowopt - <<: *linux - name: normal/gcc + name: normal+shadow/gcc compiler: gcc env: - *normal diff --git a/src/version.c b/src/version.c index 1e78c015e..79d24e9c9 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1279, +/**/ 1278, /**/ 1277, |