diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-01-11 16:54:09 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-01-11 16:54:09 +0300 |
| commit | 1bfb651bedf42f00c4c99a52fa4a7168fea1edae (patch) | |
| tree | 2df83e3068b73a1c9d04f3ae96c1a935edf86e7f | |
| parent | 95cb88595b71d73952bfbd2bbac02bfd429b6f60 (diff) | |
| download | manaplus-1bfb651bedf42f00c4c99a52fa4a7168fea1edae.tar.gz manaplus-1bfb651bedf42f00c4c99a52fa4a7168fea1edae.tar.bz2 manaplus-1bfb651bedf42f00c4c99a52fa4a7168fea1edae.tar.xz manaplus-1bfb651bedf42f00c4c99a52fa4a7168fea1edae.zip | |
Add ci jobs with unit tests with gcc 6 and SDL 2.
| -rw-r--r-- | .gitlab-ci.yml | 18 | ||||
| -rwxr-xr-x | tools/ci/jobs/gcc6_sdl2_tests.sh | 29 |
2 files changed, 47 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ad624474a..45dc5e20c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -222,6 +222,24 @@ gcc-6_tests_no_opengl_i386: tags: - docker +gcc-6_sdl2_tests: + stage: build + script: + - ./tools/ci/jobs/gcc6_sdl2_tests.sh + image: debian:unstable + <<: *job-artifacts + tags: + - docker + +gcc-6_sdl2_tests_i386: + stage: build + script: + - ./tools/ci/jobs/gcc6_sdl2_tests.sh + image: vicamo/debian:sid-i386 + <<: *job-artifacts + tags: + - docker + gcc-5_sdl2_tests: stage: build script: diff --git a/tools/ci/jobs/gcc6_sdl2_tests.sh b/tools/ci/jobs/gcc6_sdl2_tests.sh new file mode 100755 index 000000000..41940cb08 --- /dev/null +++ b/tools/ci/jobs/gcc6_sdl2_tests.sh @@ -0,0 +1,29 @@ +#!/bin/bash + +export CC=gcc-6 +export CXX=g++-6 +export LOGFILE=gcc6.log + +source ./tools/ci/scripts/init.sh + +aptget_install gcc-6 g++-6 \ + make autoconf automake autopoint gettext libphysfs-dev \ + libxml2-dev libcurl4-gnutls-dev libpng-dev \ + libsdl2-dev libsdl2-gfx-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-net-dev libsdl2-ttf-dev \ + valgrind + +export CXXFLAGS="-pedantic -ggdb3 -O2 -pipe -Wstrict-aliasing=2 \ +-Wstrict-overflow=1 -Wformat=1 -D_FORTIFY_SOURCE=2 \ +-std=gnu++1z -Wformat=1 \ +-Wno-attributes" + +source ./tools/ci/flags/gcc6.sh + +do_init +run_configure --enable-unittests=yes --with-sdl2 $* +export SDL_VIDEODRIVER=dummy +run_make_check + +source ./tools/ci/scripts/exit.sh + +exit 0 |