Restore some mingw builds

[openssl.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index c9231199225b13f1e9c01e4ae5e6828c1c1c4f99..f43bd1007dbdc2f41cd83e6fa6ef70827c964720 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,16 @@
 language: c
 
 addons:
-    apt_packages:
-        - binutils-mingw-w64
-        - gcc-mingw-w64
+    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:
     - linux
@@ -11,28 +18,54 @@ os:
 
 compiler:
     - clang
+    - clang-3.6
     - gcc
-    - i686-w64-mingw32-gcc
-    - x86_64-w64-mingw32-gcc
+    - gcc-5
 
 env:
     - CONFIG_OPTS=""
     - CONFIG_OPTS="shared"
-    - CONFIG_OPTS="--debug --strict-warnings"
+    - CONFIG_OPTS="no-pic"
+    - CONFIG_OPTS="--debug --strict-warnings enable-crypto-mdebug enable-rc5 enable-md2"
+    - CONFIG_OPTS="--unified" BUILDONLY="yes"
+    - CONFIG_OPTS="--unified shared" BUILDONLY="yes"
+    - CONFIG_OPTS="--unified --debug --strict-warnings enable-rc5 enable-md2" BUILDONLY="yes"
 
 matrix:
+    include:
+        - os: linux
+          compiler: clang-3.6
+          env: CONFIG_OPTS="-fsanitize=address"
+        - os: linux
+          compiler: clang-3.6
+          env: CONFIG_OPTS="no-asm --strict-warnings -fno-sanitize-recover -fsanitize=address -fsanitize=undefined enable-rc5 enable-md2"
+        - os: linux
+          compiler: gcc-5
+          env: CONFIG_OPTS="-fsanitize=address"
+        - os: linux
+          compiler: gcc-5
+          env: CONFIG_OPTS="no-asm --strict-warnings -fno-sanitize-recover -fsanitize=address -fsanitize=undefined enable-rc5 enable-md2"
+        - os: linux
+          compiler: clang
+          env: CONFIG_OPTS="no-engine" BUILDONLY="yes"
+        - os: linux
+          compiler: i686-w64-mingw32-gcc
+          env: CONFIG_OPTS="no-pic"
+        - os: linux
+          compiler: x86_64-w64-mingw32-gcc
+          env: CONFIG_OPTS="no-pic"
     exclude:
         - os: osx
-          compiler: i686-w64-mingw32-gcc
+          compiler: clang-3.6
         - 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"
+          compiler: gcc
+        - os: osx
+          compiler: gcc-5
 
 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;
@@ -42,11 +75,20 @@ before_script:
       else
           ./config $CONFIG_OPTS;
       fi
+    - cd ..
 
 script:
+    - cd _srcdist
     - make
-    - if [ -z "$CROSS_COMPILE" ]; then make test; fi
+    - if [ -z "$BUILDONLY" ]; then
+          if [ -n "$CROSS_COMPILE" ]; then
+              export EXE_SHELL="wine" WINEPREFIX=`pwd`;
+          fi;
+          HARNESS_VERBOSE=yes make test;
+      fi
+    - cd ..
 
 notifications:
     email:
         - openssl-commits@openssl.org
+