Add Clang 3.6 and additional GCC 5 builds to travis

Follow-up to f386742.

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

diff --git a/.travis.yml b/.travis.yml
index f27b4b635af62a287892871d08a2b5fafc698ade..3deea542c2f931a4d59585f7a5cad1384c32870a 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,10 +3,12 @@ language: c
 addons:
     apt:
         packages:
 addons:
     apt:
         packages:

+            - clang-3.6

             - gcc-5
             - binutils-mingw-w64
             - gcc-mingw-w64
         sources:
             - gcc-5
             - binutils-mingw-w64
             - gcc-mingw-w64
         sources:

+            - llvm-toolchain-precise-3.6

             - ubuntu-toolchain-r-test
 
 os:
             - ubuntu-toolchain-r-test
 
 os:


@@ -15,6 +17,7 @@ os:
 
 compiler:
     - clang
 
 compiler:
     - clang

+    - clang-3.6

     - gcc
     - gcc-5
     - i686-w64-mingw32-gcc
     - gcc
     - gcc-5
     - i686-w64-mingw32-gcc


@@ -27,10 +30,21 @@ env:
 
 matrix:
     include:
 
 matrix:
     include:

+        - os: linux
+          compiler: clang-3.6
+          env: CONFIG_OPTS="-fsanitize=address"
+        - os: linux
+          compiler: clang-3.6
+          env: CONFIG_OPTS="--debug --strict-warnings -fsanitize=address"
+        - os: linux
+          compiler: gcc-5
+          env: CONFIG_OPTS="-fsanitize=address"

         - os: linux
           compiler: gcc-5
           env: CONFIG_OPTS="--debug --strict-warnings -fsanitize=address"
     exclude:
         - os: linux
           compiler: gcc-5
           env: CONFIG_OPTS="--debug --strict-warnings -fsanitize=address"
     exclude:

+        - os: osx
+          compiler: clang-3.6

         - os: osx
           compiler: gcc-5
         - os: osx
         - os: osx
           compiler: gcc-5
         - os: osx