[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  b3943604f54239518dfd9dac492e5200f902c719 (commit)
       via  47d7ede82f68214a431c6bb56287ae58d2e91754 (commit)
      from  0e831db0a6d89a0074d910fb6d4994a3137cfb48 (commit)


- Log -----------------------------------------------------------------
commit b3943604f54239518dfd9dac492e5200f902c719
Author: Andy Polyakov <appro at openssl.org>
Date:   Mon Oct 10 12:22:10 2016 +0200

    .travis.yml: minor optimizations:
    
    - make 'pip install --user cpp-coveralls' conditional;
    - limit no-stdio to single build per operating environment;
    - omit enable-asan duplicate;
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit 47d7ede82f68214a431c6bb56287ae58d2e91754
Author: Andy Polyakov <appro at openssl.org>
Date:   Sun Oct 9 23:28:03 2016 +0200

    .travis.yml: install wine on demand.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 .travis.yml | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f15ca6b..9434f87 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,9 @@ language: c
 cache: ccache
 
 before_install:
-    - pip install --user cpp-coveralls
+    - if [ -n "$COVERALLS" ]; then
+          pip install --user cpp-coveralls;
+      fi;
 
 addons:
     apt:
@@ -12,7 +14,6 @@ addons:
             - gcc-5
             - binutils-mingw-w64
             - gcc-mingw-w64
-            - wine
         sources:
             - llvm-toolchain-precise-3.6
             - ubuntu-toolchain-r-test
@@ -39,9 +40,6 @@ matrix:
           env: CONFIG_OPTS="--debug --coverage no-asm enable-rc5 enable-md2 enable-ec_nistp_64_gcc_128 enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers" COVERALLS="yes"
         - os: linux
           compiler: clang-3.6
-          env: CONFIG_OPTS="enable-asan"
-        - os: linux
-          compiler: clang-3.6
           env: CONFIG_OPTS="enable-msan"
         - os: linux
           compiler: clang-3.6
@@ -50,23 +48,17 @@ matrix:
           compiler: clang-3.6
           env: CONFIG_OPTS="no-asm enable-asan enable-rc5 enable-md2"
         - os: linux
-          compiler: clang-3.6
-          env: CONFIG_OPTS="no-stdio"
-        - os: linux
           compiler: gcc-5
           env: CONFIG_OPTS="no-asm enable-ubsan enable-rc5 enable-md2 -DPEDANTIC"
         - os: linux
           compiler: i686-w64-mingw32-gcc
-          env: CONFIG_OPTS="no-pic"
+          env: CONFIG_OPTS="no-stdio" BUILDONLY="yes"
         - os: linux
           compiler: i686-w64-mingw32-gcc
-          env: CONFIG_OPTS="no-stdio"
-        - os: linux
-          compiler: x86_64-w64-mingw32-gcc
           env: CONFIG_OPTS="no-pic"
         - os: linux
           compiler: x86_64-w64-mingw32-gcc
-          env: CONFIG_OPTS="no-stdio"
+          env: CONFIG_OPTS="no-pic"
     exclude:
         - os: linux
           compiler: clang
@@ -115,6 +107,7 @@ script:
     - $make
     - if [ -z "$BUILDONLY" ]; then
           if [ -n "$CROSS_COMPILE" ]; then
+              sudo apt-get -yq --no-install-suggests --no-install-recommends --force-yes install wine;
               export EXE_SHELL="wine" WINEPREFIX=`pwd`;
           fi;
           HARNESS_VERBOSE=yes make test;