diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-03-05 02:16:09 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-03-05 02:16:09 +0300 |
| commit | e5dab9cd647e2bc574908340144fcb202d895dce (patch) | |
| tree | 0113505025dce17918dc5a4e3d65f0bb5cf1fa1b | |
| parent | 69ff3cb9c0c112bf102b28194395e2dc0979ba9c (diff) | |
| download | spm-e5dab9cd647e2bc574908340144fcb202d895dce.tar.gz spm-e5dab9cd647e2bc574908340144fcb202d895dce.tar.bz2 spm-e5dab9cd647e2bc574908340144fcb202d895dce.tar.xz spm-e5dab9cd647e2bc574908340144fcb202d895dce.zip | |
Fix asan builds path.
| -rwxr-xr-x | .ci/buildlib.sh | 2 | ||||
| -rw-r--r-- | .gitlab-ci.yml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.ci/buildlib.sh b/.ci/buildlib.sh index fa6481d..94b5072 100755 --- a/.ci/buildlib.sh +++ b/.ci/buildlib.sh @@ -1,7 +1,7 @@ #!/bin/bash export srcbranch="$2" -export envname="${1}_${2}" +export envname="${1}_${2}${3}" cd /usr/local/spm || exit 1 ./.ci/runretry.sh ./getsrc.sh "$1" || exit 1 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 630ed54..cfb5777 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -90,7 +90,7 @@ SDL_SDL-1.2_asan: libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev - ./.ci/copyspm.sh - export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libasan.so.3 - - ./.ci/buildlib.sh SDL SDL-1.2 + - ./.ci/buildlib.sh SDL SDL-1.2 _asan - ${runenvtool} ./.ci/buildlib.sh zlib master - ${runenvtool} ./.ci/buildlib.sh SDL_gfx master - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh physfs stable-2.0 @@ -144,7 +144,7 @@ SDL_default_asan: libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev - ./.ci/copyspm.sh - export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libasan.so.3 - - ./.ci/buildlib.sh SDL2 default + - ./.ci/buildlib.sh SDL2 default _asan - cp /usr/local/spm/env/runSDL2_default.sh /usr/local/spm/env/runSDL_default.sh - ${runenvtool} ./.ci/buildlib.sh zlib master - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh physfs stable-2.0 |