summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-03-09 01:19:30 +0300
committerAndrei Karas <akaras@inbox.ru>2017-03-09 01:19:30 +0300
commit31cda37a0f6425d0259343462fdb842df039cee1 (patch)
treee0dbc8f92cf28c9911bbfada89c59350ba1b96a5
parentd549d4f9f35df0b014000924d51be40aa4586b1e (diff)
downloadmv-31cda37a0f6425d0259343462fdb842df039cee1.tar.gz
mv-31cda37a0f6425d0259343462fdb842df039cee1.tar.bz2
mv-31cda37a0f6425d0259343462fdb842df039cee1.tar.xz
mv-31cda37a0f6425d0259343462fdb842df039cee1.zip
Fix wrong asan detection in .gitlab-ci.yml
-rw-r--r--.gitlab-ci.yml5
1 files changed, 0 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 583e99d28..bc36af9d5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1298,7 +1298,6 @@ gcc-6_sanitize_physfs:
stage: build
script:
- ./tools/ci/jobs/gcc6_sanitize.sh --with-physfs
- - ldd ./src/manaplustests | grep "libasan"
<<: *job-shared
variables:
PACKAGES: gcc-6 g++-6
@@ -1956,7 +1955,6 @@ gcc-6_SDL_SDL-1.2_sanitize_test:
- /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/scripts/checkldd.sh src/manaplustests
- - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplustests libasan
- ldd ./src/manaplustests | grep "libasan"
<<: *job-shared
variables:
@@ -1978,7 +1976,6 @@ gcc-6_SDL_default_sanitize_test:
- ./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/scripts/checkldd.sh src/manaplustests
- - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplustests libasan
- ldd ./src/manaplustests | grep "libasan"
<<: *job-shared
variables:
@@ -2087,7 +2084,6 @@ gcc-6_SDL_SDL-1.2_old_sanitize_test:
- /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/scripts/checkldd.sh src/manaplustests
- - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplustests libasan
- ldd ./src/manaplustests | grep "libasan"
<<: *job-shared
variables:
@@ -2111,7 +2107,6 @@ gcc-6_SDL_default_old_sanitize_test:
- ./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/scripts/checkldd.sh src/manaplustests
- - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplustests libasan
- ldd ./src/manaplustests | grep "libasan"
<<: *job-shared
variables: