[openssl-commits] [openssl] master update

[Emilia Kasper]

The branch master has been updated
       via  210efa8badbd5365e1aec3f901c396434ae605be (commit)
      from  37b1f8bd6260ab7d07dcc5c16f2ed88941278e82 (commit)


- Log -----------------------------------------------------------------
commit 210efa8badbd5365e1aec3f901c396434ae605be
Author: Emilia Kasper <emilia at openssl.org>
Date:   Mon Mar 7 15:15:20 2016 +0100

    Trim Travis config part 3
    
    - Only build & test two configurations. Make all the
      other build variants buildonly on gcc (clang on osx).
    - Don't build with default clang at all on linux.
    - Only use gcc-5 and clang-3.6 for the sanitizer builds. Re-running
      e.g. CONFIG_OPTS="shared" with them seems redundant.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 .travis.yml | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f43bd10..c642319 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,18 +18,16 @@ os:
 
 compiler:
     - clang
-    - clang-3.6
     - gcc
-    - gcc-5
 
 env:
-    - CONFIG_OPTS=""
     - CONFIG_OPTS="shared"
-    - CONFIG_OPTS="no-pic"
     - 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="--unified --debug --strict-warnings enable-rc5 enable-md2" BUILDONLY="yes"
+    - CONFIG_OPTS="no-pic" BUILDONLY="yes"
+    - CONFIG_OPTS="no-engine" BUILDONLY="yes"
 
 matrix:
     include:
@@ -46,21 +44,16 @@ 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
-          env: CONFIG_OPTS="no-engine" BUILDONLY="yes"
-        - os: linux
           compiler: i686-w64-mingw32-gcc
           env: CONFIG_OPTS="no-pic"
         - os: linux
           compiler: x86_64-w64-mingw32-gcc
           env: CONFIG_OPTS="no-pic"
     exclude:
-        - os: osx
-          compiler: clang-3.6
+        - os: linux
+          compiler: clang
         - os: osx
           compiler: gcc
-        - os: osx
-          compiler: gcc-5
 
 before_script:
     - sh .travis-create-release.sh $TRAVIS_OS_NAME