X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=.travis.yml;h=3deea542c2f931a4d59585f7a5cad1384c32870a;hp=286247358a0dd2d045eafbb708c63d5f5e7f8199;hb=6220acf887546709bfd583dea4fccffc95da99fc;hpb=66c103bdaba21749555c8073a3f20b7741fa5869

diff --git a/.travis.yml b/.travis.yml
index 286247358a..3deea542c2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,24 +1,77 @@
 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:
- - linux
- - osx
+    - linux
+    - osx
 
 compiler:
- - clang
- - gcc
+    - clang
+    - clang-3.6
+    - gcc
+    - gcc-5
+    - i686-w64-mingw32-gcc
+    - x86_64-w64-mingw32-gcc
 
 env:
- - CONFIG_OPTS=""
- - CONFIG_OPTS="--debug"
- - CONFIG_OPTS="shared"
+    - CONFIG_OPTS=""
+    - CONFIG_OPTS="shared"
+    - 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="--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
+    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 -Wno-pedantic-ms-format;
+      elif [ "$CC" == x86_64-w64-mingw32-gcc ]; then
+          export CROSS_COMPILE=${CC%%gcc}; unset CC;
+          ./Configure mingw64 $CONFIG_OPTS -Wno-pedantic-ms-format;
+      else
+          ./config $CONFIG_OPTS;
+      fi
 
 script:
- - ./config $CONFIG_OPTS && make && make test
+    - make
+    - if [ -z "$CROSS_COMPILE" ]; then make test; fi
 
 notifications:
-  recipient:
-   - openssl-dev@openssl.org
-  email:
-    on_success: change
-    on_failure: always
+    email:
+        - openssl-commits@openssl.org