patch 8.2.1279: some tests on Travis have EXITFREE duplicated
Problem: Some tests on Travis have EXITFREE duplicated.
Solution: Remove EXITFREE from shadowopt. Add "shadow" to job name.
diff --git a/.travis.yml b/.travis.yml
index 1f71d51..0f9aeaf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,7 @@
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 @@
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 1e78c01..79d24e9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1279,
+/**/
1278,
/**/
1277,