X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=.travis.yml;h=ce7e208dbeb841bc90d839228e7ec03c97d5c78f;hp=c642319d26f5a8200b34c540922a330c2a97467e;hb=82478521aace0ac91221ed451fceeadc007def9d;hpb=210efa8badbd5365e1aec3f901c396434ae605be

diff --git a/.travis.yml b/.travis.yml
index c642319d26..ce7e208dbe 100644
--- 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
@@ -24,8 +26,8 @@ env:
     - CONFIG_OPTS="shared"
     - CONFIG_OPTS="--debug --strict-warnings enable-crypto-mdebug enable-rc5 enable-md2"
     - CONFIG_OPTS="" BUILDONLY="yes"
-    - CONFIG_OPTS="--unified" BUILDONLY="yes"
-    - CONFIG_OPTS="--unified shared" 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"
 
@@ -58,20 +60,34 @@ matrix:
 before_script:
     - sh .travis-create-release.sh $TRAVIS_OS_NAME
     - tar -xvzf _srcdist.tar.gz
-    - cd _srcdist
+    - if echo "$CONFIG_OPTS" | grep "--classic" >/dev/null; then
+          srcdir=.;
+          cd _srcdist;
+      else
+          srcdir=../_srcdir;
+          mkdir _build;
+          cd _build;
+          if which ccache >/dev/null; then
+              CC="ccache $CC";
+          fi
+      fi
     - if [ "$CC" == i686-w64-mingw32-gcc ]; then
           export CROSS_COMPILE=${CC%%gcc}; unset CC;
-          ./Configure mingw $CONFIG_OPTS -Wno-pedantic-ms-format;
+          $srcdir/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;
+          $srcdir/Configure mingw64 $CONFIG_OPTS -Wno-pedantic-ms-format;
       else
-          ./config $CONFIG_OPTS;
+          $srcdir/config $CONFIG_OPTS;
       fi
     - cd ..
 
 script:
-    - cd _srcdist
+    - if echo "$CONFIG_OPTS" | grep "--classic" >/dev/null; then
+          cd _srcdist;
+      else
+          cd _build;
+      fi
     - make
     - if [ -z "$BUILDONLY" ]; then
           if [ -n "$CROSS_COMPILE" ]; then