[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  6220acf887546709bfd583dea4fccffc95da99fc (commit)
      from  f386742cfb811a9d2c886240e90b1064511b9acf (commit)


- Log -----------------------------------------------------------------
commit 6220acf887546709bfd583dea4fccffc95da99fc
Author: Alessandro Ghedini <alessandro at ghedini.me>
Date:   Tue Oct 6 20:27:50 2015 +0200

    Add Clang 3.6 and additional GCC 5 builds to travis
    
    Follow-up to f386742.
    
    Signed-off-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Andy Polyakov <appro at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 .travis.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index f27b4b6..3deea54 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,10 +3,12 @@ language: c
 addons:
     apt:
         packages:
+            - clang-3.6
             - gcc-5
             - binutils-mingw-w64
             - gcc-mingw-w64
         sources:
+            - llvm-toolchain-precise-3.6
             - ubuntu-toolchain-r-test
 
 os:
@@ -15,6 +17,7 @@ os:
 
 compiler:
     - clang
+    - clang-3.6
     - gcc
     - gcc-5
     - i686-w64-mingw32-gcc
@@ -28,10 +31,21 @@ env:
 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: osx
+          compiler: clang-3.6
+        - os: osx
           compiler: gcc-5
         - os: osx
           compiler: i686-w64-mingw32-gcc