summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-05-18 23:42:35 +0300
committerAndrei Karas <akaras@inbox.ru>2017-05-18 23:42:35 +0300
commita24410ac30837da6e478b107da8699363420b016 (patch)
tree2f960484f27d374ddcbf26d1ecab5abe5643d471 /tools
parent40de3bee0278d6584561a827123bc342934adccb (diff)
downloadplus-a24410ac30837da6e478b107da8699363420b016.tar.gz
plus-a24410ac30837da6e478b107da8699363420b016.tar.bz2
plus-a24410ac30837da6e478b107da8699363420b016.tar.xz
plus-a24410ac30837da6e478b107da8699363420b016.zip
Move unit test flag outside of gcc6_sanitize_tests.sh
Diffstat (limited to 'tools')
-rwxr-xr-xtools/ci/jobs/gcc6_sanitize_tests.sh2
-rwxr-xr-xtools/ci/scripts/circleci.sh8
2 files changed, 5 insertions, 5 deletions
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