diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-05-19 04:23:16 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-05-19 18:39:45 +0300 |
| commit | a407b7c3660628cb3a6b96b3f5e61bb59c9958d2 (patch) | |
| tree | 63d9e46800426efdd9380ca47eb9d437947cf429 /.gitlab-ci.yml | |
| parent | cce4b057a4ce50b60462fe243ef809d1167e97f3 (diff) | |
| download | manaplus-a407b7c3660628cb3a6b96b3f5e61bb59c9958d2.tar.gz manaplus-a407b7c3660628cb3a6b96b3f5e61bb59c9958d2.tar.bz2 manaplus-a407b7c3660628cb3a6b96b3f5e61bb59c9958d2.tar.xz manaplus-a407b7c3660628cb3a6b96b3f5e61bb59c9958d2.zip | |
Fix deheader jobs for unit tests.
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 080c9e539..df7f262ad 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3333,10 +3333,10 @@ deheader_h: <<: *job-push <<: *job-deheader_shared -deheader_cc: +deheader_catch_cc: stage: build script: - - export FLAGS="-DUNITTESTS -DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT" + - export FLAGS="-DUNITTESTS -DUNITTESTS_CATCH -DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT" - ./tools/ci/jobs/deheader.sh - find ./src -type f -name "*.cc" -exec tools/ci/scripts/deheader.sh {} \; - ./tools/ci/jobs/deheader2.sh @@ -3825,10 +3825,10 @@ deheader_sdl2_h: <<: *job-push <<: *job-deheader_sdl2_shared -deheader_sdl2_cc: +deheader_sdl2_catch_cc: stage: build script: - - export FLAGS="-DUNITTESTS -DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2" + - export FLAGS="-DUNITTESTS -DUNITTESTS_CATCH -DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2" - ./tools/ci/jobs/deheader.sh - find ./src -type f -name "*.cc" -exec tools/ci/scripts/deheader.sh {} \; - ./tools/ci/jobs/deheader2.sh @@ -4317,10 +4317,10 @@ deheader_withoutopengl_h: <<: *job-push <<: *job-deheader_shared -deheader_withoutopengl_cc: +deheader_withoutopengl_catch_cc: stage: build script: - - export FLAGS="-DUNITTESTS -DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT" + - export FLAGS="-DUNITTESTS -DUNITTESTS_CATCH -DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT" - ./tools/ci/jobs/deheader.sh - find ./src -type f -name "*.cc" -exec tools/ci/scripts/deheader.sh {} \; - ./tools/ci/jobs/deheader2.sh @@ -4809,10 +4809,10 @@ deheader_sdl2_withoutopengl_h: <<: *job-push <<: *job-deheader_sdl2_shared -deheader_sdl2_withoutopengl_cc: +deheader_sdl2_withoutopengl_catch_cc: stage: build script: - - export FLAGS="-DUNITTESTS -DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2" + - export FLAGS="-DUNITTESTS -DUNITTESTS_CATCH -DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2" - ./tools/ci/jobs/deheader.sh - find ./src -type f -name "*.cc" -exec tools/ci/scripts/deheader.sh {} \; - ./tools/ci/jobs/deheader2.sh |