summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitlab-ci.yml20
-rwxr-xr-xtools/ci/jobs/gcc49_tests.sh28
2 files changed, 38 insertions, 10 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a92c911ea..717624122 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -967,31 +967,31 @@ gcc-5_tarball_tests:
libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev
valgrind
-.gentoo_gcc-5_tests:
+gentoo_gcc-4.9_tests:
stage: build
script:
- - ./tools/ci/jobs/gcc5_tests.sh --without-dyecmd --without-manaplusgame
- image: registry.gitlab.com/manaplus/images:gentoo_gcc54_sdl1
+ - ./tools/ci/jobs/gcc49_tests.sh --without-dyecmd --without-manaplusgame
+ image: registry.gitlab.com/manaplus/images:gentoo_gcc49_sdl1
<<: *job-shared
variables:
PMUPDATE: "echo"
PMINSTALL: "echo"
- NEWCC: gcc-5.4.0
- NEWCXX: g++-5.4.0-r3
+ NEWCC: gcc-4.9.4
+ NEWCXX: g++-4.9.4
tags:
- docker
-.gentoo_gcc-5_tests_sdl2:
+gentoo_gcc-4.9_tests_sdl2:
stage: build
script:
- - ./tools/ci/jobs/gcc5_tests.sh --without-dyecmd --without-manaplusgame --with-sdl2
- image: registry.gitlab.com/manaplus/images:gentoo_gcc54_sdl2
+ - ./tools/ci/jobs/gcc49_tests.sh --without-dyecmd --without-manaplusgame --with-sdl2
+ image: registry.gitlab.com/manaplus/images:gentoo_gcc49_sdl2
<<: *job-shared
variables:
PMUPDATE: "echo"
PMINSTALL: "echo"
- NEWCC: gcc-5.4.0
- NEWCXX: g++-5.4.0-r3
+ NEWCC: gcc-4.9.4
+ NEWCXX: g++-4.9.4
tags:
- docker
diff --git a/tools/ci/jobs/gcc49_tests.sh b/tools/ci/jobs/gcc49_tests.sh
new file mode 100755
index 000000000..c4796cedc
--- /dev/null
+++ b/tools/ci/jobs/gcc49_tests.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+export CC=gcc-4.9
+export CXX=g++-4.9
+
+if [ "$NEWCC" != "" ]; then
+ export CC="$NEWCC"
+fi
+if [ "$NEWCXX" != "" ]; then
+ export CXX="$NEWCXX"
+fi
+
+export LOGFILE=gcc49_tests.log
+
+source ./tools/ci/scripts/init.sh
+
+export CXXFLAGS="-ggdb3 -O2 -pipe -ffast-math \
+-fno-omit-frame-pointer \
+-D_FORTIFY_SOURCE=2 -std=gnu++1y"
+
+do_init
+run_configure --enable-unittests=yes $*
+export SDL_VIDEODRIVER=dummy
+run_make_check
+
+source ./tools/ci/scripts/exit.sh
+
+exit 0