GH429: Add clang to travis

[openssl.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 14e0a87b7f8a4828be0d630a35d31d8ac9be1062..f27b4b635af62a287892871d08a2b5fafc698ade 100644 (file)
--- 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,28 +16,40 @@ os:
 compiler:
     - clang
     - gcc
+    - gcc-5
     - i686-w64-mingw32-gcc
     - x86_64-w64-mingw32-gcc
 
 env:
     - CONFIG_OPTS=""
     - CONFIG_OPTS="shared"
-    - CONFIG_OPTS="--d --strict-warnings"
+    - 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
           compiler: x86_64-w64-mingw32-gcc
+    allow_failures:
+        - compiler: i686-w64-mingw32-gcc
+          env: CONFIG_OPTS="--debug --strict-warnings"
+        - compiler: x86_64-w64-mingw32-gcc
+          env: CONFIG_OPTS="--debug --strict-warnings"
 
 before_script:
     - if [ "$CC" == i686-w64-mingw32-gcc ]; then
           export CROSS_COMPILE=${CC%%gcc}; unset CC;
-          ./Configure mingw $CONFIG_OPTS;
+          ./Configure mingw $CONFIG_OPTS -Wno-pedantic-ms-format;
       elif [ "$CC" == x86_64-w64-mingw32-gcc ]; then
           export CROSS_COMPILE=${CC%%gcc}; unset CC;
-          ./Configure mingw64 $CONFIG_OPTS;
+          ./Configure mingw64 $CONFIG_OPTS -Wno-pedantic-ms-format;
       else
           ./config $CONFIG_OPTS;
       fi
@@ -43,8 +59,5 @@ script:
     - if [ -z "$CROSS_COMPILE" ]; then make test; fi
 
 notifications:
-    recipient:
-        - openssl-commits@openssl.org
     email:
-        on_success: change
-        on_failure: always
+        - openssl-commits@openssl.org