summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitlab-ci.yml12
-rw-r--r--.travis.yml8
-rwxr-xr-xtools/ci/jobs/gcc6_sanitize_tests.sh2
-rwxr-xr-xtools/ci/scripts/circleci.sh8
4 files changed, 15 insertions, 15 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b3be5265f..c0494d9eb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -347,7 +347,7 @@ nsiqcppstyle:
- echo /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvz}
- export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libasan.so.3
- /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} env
- - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc6_sanitize_tests.sh --without-manaplusgame --without-dyecmd
+ - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc6_sanitize_tests.sh --enable-unittests=yes --without-manaplusgame --without-dyecmd
- export LD_PRELOAD
- /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplustests
- ldd ./src/manaplustests | grep "libasan"
@@ -372,7 +372,7 @@ nsiqcppstyle:
script:
- ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION}
- export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libasan.so.3
- - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc6_sanitize_tests.sh --with-sdl2 --without-manaplusgame --without-dyecmd
+ - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc6_sanitize_tests.sh --enable-unittests=yes --with-sdl2 --without-manaplusgame --without-dyecmd
- export LD_PRELOAD
- /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplustests
- ldd ./src/manaplustests | grep "libasan"
@@ -533,7 +533,7 @@ gcc-6_SDL_SDL-1.2_sanitize_test:
- ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION}
- echo /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvz}
- /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} env
- - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc6_sanitize_tests.sh --without-manaplusgame --without-dyecmd
+ - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc6_sanitize_tests.sh --enable-unittests=yes --without-manaplusgame --without-dyecmd
- /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplustests
- ldd ./src/manaplustests | grep "libasan"
<<: *job-push
@@ -554,7 +554,7 @@ gcc-6_SDL_default_sanitize_test:
stage: build
script:
- ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION}
- - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc6_sanitize_tests.sh --with-sdl2 --without-manaplusgame --without-dyecmd
+ - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc6_sanitize_tests.sh --enable-unittests=yes --with-sdl2 --without-manaplusgame --without-dyecmd
- /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplustests
- ldd ./src/manaplustests | grep "libasan"
<<: *job-push
@@ -578,7 +578,7 @@ gcc-6_SDL_SDL-1.2_old_sanitize_test:
- ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION}
- echo /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvz}
- /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} env
- - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc6_sanitize_tests.sh --without-manaplusgame --without-dyecmd
+ - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc6_sanitize_tests.sh --enable-unittests=yes --without-manaplusgame --without-dyecmd
- /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplustests
- ldd ./src/manaplustests | grep "libasan"
<<: *job-push
@@ -601,7 +601,7 @@ gcc-6_SDL_default_old_sanitize_test:
stage: build
script:
- ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION}
- - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc6_sanitize_tests.sh --with-sdl2 --without-manaplusgame --without-dyecmd
+ - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc6_sanitize_tests.sh --enable-unittests=yes --with-sdl2 --without-manaplusgame --without-dyecmd
- /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplustests
- ldd ./src/manaplustests | grep "libasan"
<<: *job-push
diff --git a/.travis.yml b/.travis.yml
index 600efd512..ada3a3184 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -48,7 +48,7 @@ env:
${LIBS_PACKAGES} ${SDL1}
valgrind"
- IMAGE=debian:unstable
- COMMAND="./tools/ci/jobs/gcc6_sanitize_tests.sh --disable-tmwa --without-dyecmd --without-manaplusgame"
+ COMMAND="./tools/ci/jobs/gcc6_sanitize_tests.sh --enable-unittests=yes --disable-tmwa --without-dyecmd --without-manaplusgame"
PACKAGES="gcc-6 g++-6
${LIBS_PACKAGES} ${SDL1}
valgrind"
@@ -78,7 +78,7 @@ env:
${LIBS_PACKAGES} ${SDL1}
valgrind"
- IMAGE=vicamo/debian:sid-i386
- COMMAND="./tools/ci/jobs/gcc6_sanitize_tests.sh --disable-tmwa --without-dyecmd --without-manaplusgame"
+ COMMAND="./tools/ci/jobs/gcc6_sanitize_tests.sh --enable-unittests=yes --disable-tmwa --without-dyecmd --without-manaplusgame"
PACKAGES="gcc-6 g++-6
${LIBS_PACKAGES} ${SDL1}
valgrind"
@@ -108,7 +108,7 @@ env:
${LIBS_PACKAGES} ${SDL2}
valgrind"
- IMAGE=debian:unstable
- COMMAND="./tools/ci/jobs/gcc6_sanitize_tests.sh --disable-tmwa --without-dyecmd --without-manaplusgame --with-sdl2"
+ COMMAND="./tools/ci/jobs/gcc6_sanitize_tests.sh --enable-unittests=yes --disable-tmwa --without-dyecmd --without-manaplusgame --with-sdl2"
PACKAGES="gcc-6 g++-6
${LIBS_PACKAGES} ${SDL2}
valgrind"
@@ -138,7 +138,7 @@ env:
${LIBS_PACKAGES} ${SDL2}
valgrind"
- IMAGE=vicamo/debian:sid-i386
- COMMAND="./tools/ci/jobs/gcc6_sanitize_tests.sh --disable-tmwa --without-dyecmd --without-manaplusgame --with-sdl2"
+ COMMAND="./tools/ci/jobs/gcc6_sanitize_tests.sh --enable-unittests=yes --disable-tmwa --without-dyecmd --without-manaplusgame --with-sdl2"
PACKAGES="gcc-6 g++-6
${LIBS_PACKAGES} ${SDL2}
valgrind"
diff --git a/tools/ci/jobs/gcc6_sanitize_tests.sh b/tools/ci/jobs/gcc6_sanitize_tests.sh
index c451ed0d6..86f803191 100755
--- a/tools/ci/jobs/gcc6_sanitize_tests.sh
+++ b/tools/ci/jobs/gcc6_sanitize_tests.sh
@@ -32,7 +32,7 @@ source ./tools/ci/flags/gcc6.sh
export CXXFLAGS="$CXXFLAGS $POST_CXXFLAGS"
do_init
-run_configure --enable-unittests=yes $*
+run_configure $*
export SDL_VIDEODRIVER=dummy
export ASAN_OPTIONS=detect_leaks=0
export LSAN_OPTIONS=suppressions=$(pwd)/tools/ci/scripts/lsansuppression_tests.txt
diff --git a/tools/ci/scripts/circleci.sh b/tools/ci/scripts/circleci.sh
index 1341d98f6..191884211 100755
--- a/tools/ci/scripts/circleci.sh
+++ b/tools/ci/scripts/circleci.sh
@@ -21,7 +21,7 @@ case $CIRCLE_NODE_INDEX in
./tools/ci/scripts/docker_run.sh
export IMAGE=debian:unstable
- export COMMAND="./tools/ci/jobs/gcc6_sanitize_tests.sh --without-dyecmd --without-manaplusgame --without-opengl"
+ export COMMAND="./tools/ci/jobs/gcc6_sanitize_tests.sh --enable-unittests=yes --without-dyecmd --without-manaplusgame --without-opengl"
export PACKAGES="gcc-6 g++-6 ${LIBS_PACKAGES} ${SDL1} valgrind"
./tools/ci/scripts/docker_run.sh
@@ -47,7 +47,7 @@ case $CIRCLE_NODE_INDEX in
./tools/ci/scripts/docker_run.sh
export IMAGE=vicamo/debian:sid-i386
- export COMMAND="./tools/ci/jobs/gcc6_sanitize_tests.sh --without-dyecmd --without-manaplusgame --without-opengl"
+ export COMMAND="./tools/ci/jobs/gcc6_sanitize_tests.sh --enable-unittests=yes --without-dyecmd --without-manaplusgame --without-opengl"
export PACKAGES="gcc-6 g++-6 ${LIBS_PACKAGES} ${SDL1} valgrind"
./tools/ci/scripts/docker_run.sh
@@ -73,7 +73,7 @@ case $CIRCLE_NODE_INDEX in
./tools/ci/scripts/docker_run.sh
export IMAGE=debian:unstable
- export COMMAND="./tools/ci/jobs/gcc6_sanitize_tests.sh --without-dyecmd --without-manaplusgame --without-opengl --with-sdl2"
+ export COMMAND="./tools/ci/jobs/gcc6_sanitize_tests.sh --enable-unittests=yes --without-dyecmd --without-manaplusgame --without-opengl --with-sdl2"
export PACKAGES="gcc-6 g++-6 ${LIBS_PACKAGES} ${SDL2} valgrind"
./tools/ci/scripts/docker_run.sh
@@ -99,7 +99,7 @@ case $CIRCLE_NODE_INDEX in
./tools/ci/scripts/docker_run.sh
export IMAGE=vicamo/debian:sid-i386
- export COMMAND="./tools/ci/jobs/gcc6_sanitize_tests.sh --without-dyecmd --without-manaplusgame --without-opengl --with-sdl2"
+ export COMMAND="./tools/ci/jobs/gcc6_sanitize_tests.sh --enable-unittests=yes --without-dyecmd --without-manaplusgame --without-opengl --with-sdl2"
export PACKAGES="gcc-6 g++-6 ${LIBS_PACKAGES} ${SDL2} valgrind"
./tools/ci/scripts/docker_run.sh
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-16 03:44:46 +0000