Adapt the OS X build to use the OS X tar

[openssl.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index f27b4b635af62a287892871d08a2b5fafc698ade..b16998bd50d4e37a2e984ac8c73494d5f92be3dd 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
@@ -23,20 +27,40 @@ compiler:
 env:
     - CONFIG_OPTS=""
     - CONFIG_OPTS="shared"
+    - CONFIG_OPTS="no-asm"
     - CONFIG_OPTS="--debug --strict-warnings"
 
 matrix:
     include:
+        - os: linux
+          compiler: clang-3.6
+          env: CONFIG_OPTS="-fsanitize=address"
+        - os: linux
+          compiler: clang-3.6
+          env: CONFIG_OPTS="no-asm --debug --strict-warnings -fno-sanitize-recover -fsanitize=address -fsanitize=undefined"
         - os: linux
           compiler: gcc-5
-          env: CONFIG_OPTS="--debug --strict-warnings -fsanitize=address"
+          env: CONFIG_OPTS="-fsanitize=address"
+        - os: linux
+          compiler: gcc-5
+          env: CONFIG_OPTS="no-asm --debug --strict-warnings -fno-sanitize-recover -fsanitize=address -fsanitize=undefined"
     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"
+        - compiler: i686-w64-mingw32-gcc
+          env: CONFIG_OPTS="no-asm"
+        - compiler: x86_64-w64-mingw32-gcc
+          env: CONFIG_OPTS="no-asm"
     allow_failures:
         - compiler: i686-w64-mingw32-gcc
           env: CONFIG_OPTS="--debug --strict-warnings"
@@ -44,6 +68,9 @@ matrix:
           env: CONFIG_OPTS="--debug --strict-warnings"
 
 before_script:
+    - sh .travis-create-release.sh $TRAVIS_OS_NAME
+    - tar -xvzf _srcdist.tar.gz
+    - cd _srcdist
     - if [ "$CC" == i686-w64-mingw32-gcc ]; then
           export CROSS_COMPILE=${CC%%gcc}; unset CC;
           ./Configure mingw $CONFIG_OPTS -Wno-pedantic-ms-format;
@@ -53,10 +80,16 @@ before_script:
       else
           ./config $CONFIG_OPTS;
       fi
+    - cd ..
 
 script:
+    - cd _srcdist
     - make
-    - if [ -z "$CROSS_COMPILE" ]; then make test; fi
+    - if [ -n "$CROSS_COMPILE" ]; then
+          export EXE_SHELL="wine" WINEPREFIX=`pwd`;
+      fi
+    - make test
+    - cd ..
 
 notifications:
     email: