[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  042597b0ace7e3adc8a79f6e096eef659ce1d9d5 (commit)
      from  51909407c2acbcb36dde31314676924d2fee29a1 (commit)


- Log -----------------------------------------------------------------
commit 042597b0ace7e3adc8a79f6e096eef659ce1d9d5
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Jun 1 17:35:23 2017 +0100

    Work around Travis "virtual memory exhausted" error
    
    One particular build was running out of memory. By swapping to debug mode
    we reduce the optimisation level which should reduce the amount of memory
    required.
    
    [extended tests]
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3601)

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

Summary of changes:
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 03028f3..a7ef6ff 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -121,7 +121,7 @@ matrix:
                   sources:
                       - ubuntu-toolchain-r-test
           compiler: gcc-5
-          env: EXTENDED_TEST="yes" CONFIG_OPTS="no-asm enable-ubsan enable-rc5 enable-md2 enable-aria -DPEDANTIC" OPENSSL_TEST_RAND_ORDER=0
+          env: EXTENDED_TEST="yes" CONFIG_OPTS="--debug no-asm enable-ubsan enable-rc5 enable-md2 enable-aria -DPEDANTIC" OPENSSL_TEST_RAND_ORDER=0
         - os: linux
           addons:
               apt: