From: Dmitry V. Levin <ldv@altlinux.org>
Date: Wed, 12 Apr 2017 03:06:32 +0000 (+0000)
Subject: travis: add gcc-6
X-Git-Tag: v4.17~108
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ffe3df1a4d803f7ca0252ed023e4013d1dbdf458;p=strace

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 60793764..22a2b28d 100644
--- 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 c25a6fc2..cf971516 100755
--- 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 c4f6b8b6..ff21f16b 100755
--- 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"
 		;;