add -pthread to debug-steve*

[openssl.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index f27b4b635af62a287892871d08a2b5fafc698ade..5d7cf6992a6471f1b701927a1a58a0ab3be56840 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,10 +3,13 @@ language: c
 addons:
     apt:
         packages:
+            - clang-3.6
             - gcc-5
             - binutils-mingw-w64
             - gcc-mingw-w64
+            - wine
         sources:
+            - llvm-toolchain-precise-3.6
             - ubuntu-toolchain-r-test
 
 os:
@@ -15,6 +18,7 @@ os:
 
 compiler:
     - clang
+    - clang-3.6
     - gcc
     - gcc-5
     - i686-w64-mingw32-gcc
@@ -27,16 +31,31 @@ 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
         - os: osx
           compiler: x86_64-w64-mingw32-gcc
+        - compiler: i686-w64-mingw32-gcc
+          env: CONFIG_OPTS="shared"
+        - compiler: x86_64-w64-mingw32-gcc
+          env: CONFIG_OPTS="shared"
     allow_failures:
         - compiler: i686-w64-mingw32-gcc
           env: CONFIG_OPTS="--debug --strict-warnings"
@@ -56,7 +75,10 @@ before_script:
 
 script:
     - make
-    - if [ -z "$CROSS_COMPILE" ]; then make test; fi
+    - if [ -n "$CROSS_COMPILE" ]; then
+          export EXE_SHELL="wine" WINEPREFIX=`pwd`;
+      fi
+    - make test
 
 notifications:
     email: