diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-05-18 23:42:35 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-05-18 23:42:35 +0300 |
| commit | a24410ac30837da6e478b107da8699363420b016 (patch) | |
| tree | 2f960484f27d374ddcbf26d1ecab5abe5643d471 /.gitlab-ci.yml | |
| parent | 40de3bee0278d6584561a827123bc342934adccb (diff) | |
| download | manaplus-a24410ac30837da6e478b107da8699363420b016.tar.gz manaplus-a24410ac30837da6e478b107da8699363420b016.tar.bz2 manaplus-a24410ac30837da6e478b107da8699363420b016.tar.xz manaplus-a24410ac30837da6e478b107da8699363420b016.zip | |
Move unit test flag outside of gcc6_sanitize_tests.sh
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 12 |
1 files changed, 6 insertions, 6 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 |