summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-12-22 19:00:35 +0300
committerAndrei Karas <akaras@inbox.ru>2016-12-22 19:00:35 +0300
commit2da94c63be0dd5ff21442ffdf594d8862ac2c656 (patch)
tree53f2ae2764a1699849696a2764afa1579158c051
parent3719c196c88723c0d9f05a92ef30454429a4b82f (diff)
downloadmv-2da94c63be0dd5ff21442ffdf594d8862ac2c656.tar.gz
mv-2da94c63be0dd5ff21442ffdf594d8862ac2c656.tar.bz2
mv-2da94c63be0dd5ff21442ffdf594d8862ac2c656.tar.xz
mv-2da94c63be0dd5ff21442ffdf594d8862ac2c656.zip
Add ci tests without opengl support.
-rw-r--r--.gitlab-ci.yml54
-rwxr-xr-xtools/ci/jobs/gcc5_sanitize_tests.sh2
-rwxr-xr-xtools/ci/jobs/gcc5_sdl2_tests.sh2
-rwxr-xr-xtools/ci/jobs/gcc6_tests.sh2
4 files changed, 57 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e175018c2..a69181278 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -133,6 +133,24 @@ gcc-5_sanitize_tests_i386:
tags:
- docker
+gcc-5_sanitize_no_opengl_tests:
+ stage: build
+ script:
+ - ./tools/ci/jobs/gcc5_sanitize_tests.sh --without-opengl
+ image: debian:unstable
+ <<: *log-failed-jobs
+ tags:
+ - docker
+
+gcc-5_sanitize_no_opengltests_i386:
+ stage: build
+ script:
+ - ./tools/ci/jobs/gcc5_sanitize_tests.sh --without-opengl
+ image: vicamo/debian:sid-i386
+ <<: *log-failed-jobs
+ tags:
+ - docker
+
gcc-5_tests:
stage: build
script:
@@ -169,6 +187,24 @@ gcc-6_tests_i386:
tags:
- docker
+gcc-6_tests_no_opengl:
+ stage: build
+ script:
+ - ./tools/ci/jobs/gcc6_tests.sh --without-opengl
+ image: debian:unstable
+ <<: *log-failed-jobs
+ tags:
+ - docker
+
+gcc-6_tests_no_opengl_i386:
+ stage: build
+ script:
+ - ./tools/ci/jobs/gcc6_tests.sh --without-opengl
+ image: vicamo/debian:sid-i386
+ <<: *log-failed-jobs
+ tags:
+ - docker
+
gcc-5_sdl2_tests:
stage: build
script:
@@ -187,6 +223,24 @@ gcc-5_sdl2_tests_i386:
tags:
- docker
+gcc-5_sdl2_no_opengl_tests:
+ stage: build
+ script:
+ - ./tools/ci/jobs/gcc5_sdl2_tests.sh --without-opengl
+ image: debian:unstable
+ <<: *log-failed-jobs
+ tags:
+ - docker
+
+gcc-5_sdl2_no_opengl_tests_i386:
+ stage: build
+ script:
+ - ./tools/ci/jobs/gcc5_sdl2_tests.sh --without-opengl
+ image: vicamo/debian:sid-i386
+ <<: *log-failed-jobs
+ tags:
+ - docker
+
gcc-6_lto:
stage: build
script:
diff --git a/tools/ci/jobs/gcc5_sanitize_tests.sh b/tools/ci/jobs/gcc5_sanitize_tests.sh
index 4e5536eed..b5b944780 100755
--- a/tools/ci/jobs/gcc5_sanitize_tests.sh
+++ b/tools/ci/jobs/gcc5_sanitize_tests.sh
@@ -55,7 +55,7 @@ export CXXFLAGS="-ggdb3 -O2 -pipe -ffast-math \
-Wreturn-type -Wsequence-point -Wswitch"
do_init
-run_configure --enable-unittests=yes
+run_configure --enable-unittests=yes $*
export SDL_VIDEODRIVER=dummy
export ASAN_OPTIONS=detect_leaks=0
run_make_check
diff --git a/tools/ci/jobs/gcc5_sdl2_tests.sh b/tools/ci/jobs/gcc5_sdl2_tests.sh
index 33886af83..4d335a1ad 100755
--- a/tools/ci/jobs/gcc5_sdl2_tests.sh
+++ b/tools/ci/jobs/gcc5_sdl2_tests.sh
@@ -46,7 +46,7 @@ export CXXFLAGS="-ggdb3 -O2 -pipe -ffast-math \
-Wlogical-not-parentheses -Woverloaded-virtual"
do_init
-run_configure --with-sdl2 --enable-unittests=yes
+run_configure --with-sdl2 --enable-unittests=yes $*
export SDL_VIDEODRIVER=dummy
run_make_check
diff --git a/tools/ci/jobs/gcc6_tests.sh b/tools/ci/jobs/gcc6_tests.sh
index 8a0a60f14..d91ea87fd 100755
--- a/tools/ci/jobs/gcc6_tests.sh
+++ b/tools/ci/jobs/gcc6_tests.sh
@@ -19,7 +19,7 @@ export CXXFLAGS="-pedantic -ggdb3 -O2 -pipe -Wstrict-aliasing=2 \
source ./tools/ci/flags/gcc6.sh
do_init
-run_configure --enable-unittests=yes
+run_configure --enable-unittests=yes $*
export SDL_VIDEODRIVER=dummy
run_make_check