travis: add gcc-6

* .travis.yml (matrix): Add gcc-6 entries.
* travis-build.sh: Handle gcc*.
* travis-install.sh: Handle gcc-*.

diff --git a/.travis.yml b/.travis.yml
index 607937649c9541c5a031bf71329153ce9022f10b..22a2b28d9ddce7933be14f8b91b8cb8f6870d334 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,6 +39,15 @@ matrix:
     - compiler: musl-gcc
       env:
         - TARGET=x86
+    - compiler: gcc-6
+      env:
+        - TARGET=x86_64
+    - compiler: gcc-6
+      env:
+        - TARGET=x32
+    - compiler: gcc-6
+      env:
+        - TARGET=x86
     - compiler: gcc
       env:
         - TARGET=x86_64

diff --git a/travis-build.sh b/travis-build.sh
index c25a6fc24610aa046882a5817b41d2d72cceb198..cf9715162428e96c1707db0c79003cd7358b4837 100755 (executable)
--- a/travis-build.sh
+++ b/travis-build.sh
@@ -1,7 +1,7 @@
 #!/bin/sh -ex
 
 case "$CC" in
-       gcc)
+       gcc*)
                DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS --enable-gcc-Werror"
                ;;
        clang-*)

diff --git a/travis-install.sh b/travis-install.sh
index c4f6b8b64db149dbd5ad755b8632e162b575a052..ff21f16b7cc27c8dd31ec673246c7feee1069c67 100755 (executable)
--- a/travis-install.sh
+++ b/travis-install.sh
@@ -15,6 +15,10 @@ case "$CC" in
        gcc)
                apt_get_install gcc-multilib
                ;;
+       gcc-*)
+               sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
+               apt_get_install gcc-multilib "$CC"-multilib
+               ;;
        clang-*)
                apt_get_install gcc-multilib "$CC"
                ;;