Adjust --strict-warnings builds in Travis

[openssl.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index ac8d81295dc4308f8725b1b7d96187f11f1f9331..27f4b37f55e923dc26851470cb35e2c2d5e0ac3a 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,12 +24,12 @@ compiler:
 
 env:
     - CONFIG_OPTS="shared"
-    - CONFIG_OPTS="--debug --strict-warnings enable-crypto-mdebug enable-rc5 enable-md2"
-    - CONFIG_OPTS="" BUILDONLY="yes"
+    - CONFIG_OPTS="--debug enable-crypto-mdebug enable-rc5 enable-md2"
+    - CONFIG_OPTS="--strict-warnings" BUILDONLY="yes"
     - CONFIG_OPTS="--classic" BUILDONLY="yes"
     - CONFIG_OPTS="--classic shared" BUILDONLY="yes"
-    - CONFIG_OPTS="no-pic" BUILDONLY="yes"
-    - CONFIG_OPTS="no-engine" BUILDONLY="yes"
+    - CONFIG_OPTS="no-pic --strict-warnings" BUILDONLY="yes"
+    - CONFIG_OPTS="no-engine --strict-warnings" BUILDONLY="yes"
 
 matrix:
     include:
@@ -38,13 +38,13 @@ matrix:
           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"
+          env: CONFIG_OPTS="no-asm -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"
+          env: CONFIG_OPTS="no-asm -fno-sanitize-recover -fsanitize=address -fsanitize=undefined enable-rc5 enable-md2"
         - os: linux
           compiler: i686-w64-mingw32-gcc
           env: CONFIG_OPTS="no-pic"
@@ -60,16 +60,13 @@ matrix:
 before_script:
     - sh .travis-create-release.sh $TRAVIS_OS_NAME
     - tar -xvzf _srcdist.tar.gz
-    - if echo "$CONFIG_OPTS" | grep "--unified" >/dev/null; then
-          srcdir=../_srcdir;
-          mkdir _build;
-          cd _build;
-          if which ccache >/dev/null; then
-              CC="ccache $CC";
-          fi
-      else
+    - if echo "$CONFIG_OPTS" | grep -e "--classic" >/dev/null; then
           srcdir=.;
           cd _srcdist;
+      else
+          srcdir=../_srcdist;
+          mkdir _build;
+          cd _build;
       fi
     - if [ "$CC" == i686-w64-mingw32-gcc ]; then
           export CROSS_COMPILE=${CC%%gcc}; unset CC;
@@ -78,15 +75,18 @@ before_script:
           export CROSS_COMPILE=${CC%%gcc}; unset CC;
           $srcdir/Configure mingw64 $CONFIG_OPTS -Wno-pedantic-ms-format;
       else
+          if which ccache >/dev/null && [ "$CC" != clang-3.6 ]; then
+              CC="ccache $CC";
+          fi;
           $srcdir/config $CONFIG_OPTS;
       fi
     - cd ..
 
 script:
-    - if expr "$CONFIG_OPTS" : "--unified"; then
-          cd _build;
-      else
+    - if echo "$CONFIG_OPTS" | grep -e "--classic" >/dev/null; then
           cd _srcdist;
+      else
+          cd _build;
       fi
     - make
     - if [ -z "$BUILDONLY" ]; then
@@ -94,6 +94,8 @@ script:
               export EXE_SHELL="wine" WINEPREFIX=`pwd`;
           fi;
           HARNESS_VERBOSE=yes make test;
+      else
+          make build_tests;
       fi
     - cd ..