Add gcc snapshot and gcc 4.6 and different flags combinations.

3 files changed, 73 insertions, 6 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e5abbd9..fd5ceed 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,6 +10,18 @@ before_script:
 
 # simple builds
 
+gcc-snapshot:
+  stage: build
+  script:
+  - ./tools/ci/jobs/gccsnapshot.sh --enable-werror
+  image: debian:unstable
+
+gcc-snapshot-i386:
+  stage: build
+  script:
+  - ./tools/ci/jobs/gccsnapshot.sh --enable-werror
+  image: vicamo/debian:sid-i386
+
 gcc-4.8:
   stage: build
   script:
@@ -54,6 +66,18 @@ clang-3.9-i386:
 
 # tests
 
+gcc-snapshot_lto-sanitize:
+  stage: test
+  script:
+  - ./tools/ci/jobs/gccsnapshot.sh --enable-werror --enable-lto --enable-sanitize
+  image: debian:unstable
+
+gcc-snapshot-sanitize:
+  stage: test
+  script:
+  - ./tools/ci/jobs/gccsnapshot.sh --enable-werror --enable-sanitize
+  image: debian:unstable
+
 gcc-4.9-sanitize:
   stage: test
   script:
@@ -75,13 +99,13 @@ gcc-6-sanitize:
 gcc-4.9_lto-sanitize:
   stage: test
   script:
-  - ./tools/ci/jobs/gcc49.sh --enable-werror --enable-sanitize --enable-sanitize
+  - ./tools/ci/jobs/gcc49.sh --enable-werror --enable-lto --enable-sanitize
   image: debian:unstable
 
 gcc-5_lto-sanitize:
   stage: test
   script:
-  - ./tools/ci/jobs/gcc5.sh --enable-werror --enable-sanitize --enable-sanitize
+  - ./tools/ci/jobs/gcc5.sh --enable-werror --enable-lto --enable-sanitize
   image: debian:unstable
 
 gcc-6_lto-sanitize:
@@ -114,24 +138,30 @@ gcc-6_lto:
   - ./tools/ci/jobs/gcc6.sh --enable-werror --enable-lto
   image: debian:unstable
 
+gcc-4.6:
+  stage: test
+  script:
+  - ./tools/ci/jobs/gcc46.sh --enable-werror
+  image: debian:oldstable
+
 # legacy
 
 gcc-4.9_stable_lto-sanitize:
   stage: legacy
   script:
-  - ./tools/ci/jobs/gcc49.sh --enable-werror --enable-sanitize --enable-sanitize
+  - ./tools/ci/jobs/gcc49.sh --enable-werror --enable-lto --enable-sanitize
   image: debian:stable
 
 gcc-4.9_testing_lto-sanitize:
   stage: legacy
   script:
-  - ./tools/ci/jobs/gcc49.sh --enable-werror --enable-sanitize --enable-sanitize
+  - ./tools/ci/jobs/gcc49.sh --enable-werror --enable-lto --enable-sanitize
   image: debian:testing
 
 gcc-5_testing_lto-sanitize:
-  stage: test
+  stage: legacy
   script:
-  - ./tools/ci/jobs/gcc5.sh --enable-werror --enable-sanitize --enable-sanitize
+  - ./tools/ci/jobs/gcc5.sh --enable-werror --enable-lto --enable-sanitize
   image: debian:testing
 
 # reports
diff --git a/tools/ci/jobs/gcc46.sh b/tools/ci/jobs/gcc46.sh
new file mode 100755
index 0000000..f66f604
--- /dev/null
+++ b/tools/ci/jobs/gcc46.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+export CC=gcc-4.6
+export CXX=g++-4.6
+export LOGFILE=gcc4.6.log
+
+source ./tools/ci/scripts/init.sh
+
+aptget_install gcc-4.6 \
+    git-core \
+    make autoconf automake autopoint \
+    libtool libmysqlclient-dev libz-dev libpcre3-dev
+
+do_init
+build_init
+
+run_configure $*
+run_make
diff --git a/tools/ci/jobs/gccsnapshot.sh b/tools/ci/jobs/gccsnapshot.sh
new file mode 100755
index 0000000..542ce31
--- /dev/null
+++ b/tools/ci/jobs/gccsnapshot.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+export CC=gcc
+export CXX=g++
+export LOGFILE=gcc-snapshot.log
+export PATH=/usr/lib/gcc-snapshot/bin:$PATH
+
+source ./tools/ci/scripts/init.sh
+
+aptget_install gcc-snapshot \
+    git-core \
+    make autoconf automake autopoint \
+    libtool libmysqlclient-dev libz-dev libpcre3-dev
+
+do_init
+build_init
+
+run_configure $*
+run_make