From: Alessandro Ghedini <alessandro@ghedini.me>
Date: Mon, 12 Oct 2015 20:15:43 +0000 (-0400)
Subject: GH429: Add clang to travis
X-Git-Tag: OpenSSL_1_1_0-pre1~429
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=f386742cfb811a9d2c886240e90b1064511b9acf;ds=sidebyside

GH429: Add clang to travis

Signed-off-by: Rich Salz <rsalz@akamai.com>
Reviewed-by: Andy Polyakov <appro@openssl.org>
---

diff --git a/.travis.yml b/.travis.yml
index c923119922..f27b4b635a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,13 @@
 language: c
 
 addons:
-    apt_packages:
-        - binutils-mingw-w64
-        - gcc-mingw-w64
+    apt:
+        packages:
+            - gcc-5
+            - binutils-mingw-w64
+            - gcc-mingw-w64
+        sources:
+            - ubuntu-toolchain-r-test
 
 os:
     - linux
@@ -12,6 +16,7 @@ os:
 compiler:
     - clang
     - gcc
+    - gcc-5
     - i686-w64-mingw32-gcc
     - x86_64-w64-mingw32-gcc
 
@@ -21,7 +26,13 @@ env:
     - CONFIG_OPTS="--debug --strict-warnings"
 
 matrix:
+    include:
+        - os: linux
+          compiler: gcc-5
+          env: CONFIG_OPTS="--debug --strict-warnings -fsanitize=address"
     exclude:
+        - os: osx
+          compiler: gcc-5
         - os: osx
           compiler: i686-w64-mingw32-gcc
         - os: osx
diff --git a/Configure b/Configure
index b27795789e..06b2278c16 100755
--- a/Configure
+++ b/Configure
@@ -1640,7 +1640,7 @@ if ($strict_warnings)
 	my $ecc = $cc;
 	$ecc = "clang" if `$cc --version 2>&1` =~ /clang/;
 	my $wopt;
-	die "ERROR --strict-warnings requires gcc or clang" unless ($ecc =~ /gcc$/ or $ecc =~ /clang$/);
+	die "ERROR --strict-warnings requires gcc or clang" unless ($ecc =~ /gcc(-\d(\.\d)*)?$/ or $ecc =~ /clang$/);
 	foreach $wopt (split /\s+/, $gcc_devteam_warn)
 		{
 		$cflags .= " $wopt" unless ($cflags =~ /$wopt/)