X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=.travis.yml;h=359a9805d0d2196bbaf05abdcb64e6748a8425f4;hp=ac8d81295dc4308f8725b1b7d96187f11f1f9331;hb=c828cd7cd0426dde10b07e7b68f3741a5ea91fc6;hpb=c9aad4ff4f9f37a2d8685db4b1ce310452f41e89

diff --git a/.travis.yml b/.travis.yml
index ac8d81295d..359a9805d0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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 ..