[openssl-commits] [openssl] master update

[Emilia Kasper]

The branch master has been updated
       via  b63447c1150f659cfc54ed290df33345e8ce7cbd (commit)
      from  3135650970f280cce0fdbbf06024daa8b23bfd85 (commit)


- Log -----------------------------------------------------------------
commit b63447c1150f659cfc54ed290df33345e8ce7cbd
Author: Emilia Kasper <emilia at openssl.org>
Date:   Sun Mar 6 22:31:18 2016 +0100

    Trim Travis config part 2
    
    - Remove Win builds (temporarily). They're slow, allowed to fail,
      and therefore not useful as they are.
    - Make the --unified part of the matrix build-only. (This can be
      swapped if --unified becomes the default)
    - Only build 'no-engine' once, don't run any tests, but don't allow it
      to fail.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 .travis.yml | 53 +++++++----------------------------------------------
 1 file changed, 7 insertions(+), 46 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5be74f0..5407b5f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,9 +5,6 @@ addons:
         packages:
             - clang-3.6
             - gcc-5
-            - binutils-mingw-w64
-            - gcc-mingw-w64
-            - wine
         sources:
             - llvm-toolchain-precise-3.6
             - ubuntu-toolchain-r-test
@@ -21,17 +18,15 @@ compiler:
     - clang-3.6
     - gcc
     - gcc-5
-    - i686-w64-mingw32-gcc
-    - x86_64-w64-mingw32-gcc
 
 env:
     - CONFIG_OPTS=""
     - CONFIG_OPTS="shared"
     - CONFIG_OPTS="no-pic"
     - CONFIG_OPTS="--debug --strict-warnings enable-crypto-mdebug enable-rc5 enable-md2"
-    - CONFIG_OPTS="--unified"
-    - CONFIG_OPTS="--unified shared"
-    - CONFIG_OPTS="--unified --debug --strict-warnings enable-crypto-mdebug enable-rc5 enable-md2"
+    - CONFIG_OPTS="--unified" BUILDONLY="yes"
+    - CONFIG_OPTS="--unified shared" BUILDONLY="yes"
+    - CONFIG_OPTS="--unified --debug --strict-warnings enable-rc5 enable-md2" BUILDONLY="yes"
 
 matrix:
     include:
@@ -48,14 +43,8 @@ matrix:
           compiler: gcc-5
           env: CONFIG_OPTS="no-asm --strict-warnings -fno-sanitize-recover -fsanitize=address -fsanitize=undefined enable-rc5 enable-md2"
         - os: linux
-          compiler: clang-3.6
-          env: CONFIG_OPTS="no-engine"
-        - os: linux
-          compiler: gcc
-          env: CONFIG_OPTS="no-engine"
-        - os: linux
-          compiler: gcc-5
-          env: CONFIG_OPTS="no-engine"
+          compiler: clang
+          env: CONFIG_OPTS="no-engine" BUILDONLY="yes"
     exclude:
         - os: osx
           compiler: clang-3.6
@@ -63,33 +52,6 @@ matrix:
           compiler: gcc
         - os: osx
           compiler: gcc-5
-        - os: osx
-          compiler: i686-w64-mingw32-gcc
-        - os: osx
-          compiler: x86_64-w64-mingw32-gcc
-        - compiler: i686-w64-mingw32-gcc
-          env: CONFIG_OPTS="shared"
-        - compiler: x86_64-w64-mingw32-gcc
-          env: CONFIG_OPTS="shared"
-        - compiler: i686-w64-mingw32-gcc
-          env: CONFIG_OPTS="--unified shared"
-        - compiler: x86_64-w64-mingw32-gcc
-          env: CONFIG_OPTS="--unified shared"
-    allow_failures:
-        - compiler: i686-w64-mingw32-gcc
-          env: CONFIG_OPTS="--debug --strict-warnings enable-crypto-mdebug enable-rc5 enable-md2"
-        - compiler: x86_64-w64-mingw32-gcc
-          env: CONFIG_OPTS="--debug --strict-warnings enable-crypto-mdebug enable-rc5 enable-md2"
-        - compiler: i686-w64-mingw32-gcc
-          env: CONFIG_OPTS="--unified --debug --strict-warnings enable-crypto-mdebug enable-rc5 enable-md2"
-        - compiler: x86_64-w64-mingw32-gcc
-          env: CONFIG_OPTS="--unified --debug --strict-warnings enable-crypto-mdebug enable-rc5 enable-md2"
-        - compiler: clang-3.6
-          env: CONFIG_OPTS="no-engine"
-        - compiler: gcc-5
-          env: CONFIG_OPTS="no-engine"
-        - compiler: gcc
-          env: CONFIG_OPTS="no-engine"
 
 before_script:
     - sh .travis-create-release.sh $TRAVIS_OS_NAME
@@ -109,10 +71,9 @@ before_script:
 script:
     - cd _srcdist
     - make
-    - if [ -n "$CROSS_COMPILE" ]; then
-          export EXE_SHELL="wine" WINEPREFIX=`pwd`;
+    - if [ -z "$BUILDONLY" ]; then
+          HARNESS_VERBOSE=yes make test;
       fi
-    - HARNESS_VERBOSE=yes make test
     - cd ..
 
 notifications: