Appveyor - make sure to actually build "shared" in the shared configuration

[openssl.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index f1c43cc4140e3fdda3483fa694a96f7ec04c9b1c..359a9805d0d2196bbaf05abdcb64e6748a8425f4 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,10 @@
 language: c
+cache: ccache
 
 addons:
     apt:
         packages:
+            - ccache
             - clang-3.6
             - gcc-5
             - binutils-mingw-w64
@@ -58,13 +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;
-      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;
@@ -73,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
@@ -89,6 +94,8 @@ script:
               export EXE_SHELL="wine" WINEPREFIX=`pwd`;
           fi;
           HARNESS_VERBOSE=yes make test;
+      else
+          make build_tests;
       fi
     - cd ..