[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  34fffdb521040d3bc658c1ceaa9c79fbd191ded3 (commit)
       via  cd838c655289951989fb47826cb753b365cfcec3 (commit)
       via  8c1054ae084935d67eb24f9efa82fb462d3a222a (commit)
      from  30f1c9c4e08d479ab57fa6974dd99b077c745ffb (commit)


- Log -----------------------------------------------------------------
commit 34fffdb521040d3bc658c1ceaa9c79fbd191ded3
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Mar 21 15:59:12 2017 +0100

    Refuse to run the PYCA external test if configured 'no-shared'
    
    [extended tests]
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3007)

commit cd838c655289951989fb47826cb753b365cfcec3
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Mar 21 15:57:03 2017 +0100

    Travis: make a separate job for external tests
    
    Some of the external tests do not run well with 'no-shared'
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3007)

commit 8c1054ae084935d67eb24f9efa82fb462d3a222a
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Mar 21 13:48:13 2017 +0100

    95-test_external_pyca_data/cryptography.py: only install for testing
    
    Also, be less silent when installing, so possible errors are shown.
    
    [extended tests]
    
    Fixes #3005
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3007)

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

Summary of changes:
 .travis.yml                                             | 12 +++++++++++-
 test/recipes/95-test_external_pyca.t                    |  2 ++
 test/recipes/95-test_external_pyca_data/cryptography.sh |  2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bfec26c..662b8b5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -71,7 +71,17 @@ matrix:
                   sources:
                       - ubuntu-toolchain-r-test
           compiler: gcc-5
-          env:  EXTENDED_TEST="yes" CONFIG_OPTS="--debug --coverage no-asm enable-rc5 enable-md2 enable-ec_nistp_64_gcc_128 enable-ssl3 enable-ssl3-method enable-nextprotoneg enable-weak-ssl-ciphers enable-external-tests no-shared -DPEDANTIC -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION" COVERALLS="yes" BORINGSSL_TESTS="yes" CXX="g++-5"
+          env:  EXTENDED_TEST="yes" CONFIG_OPTS="--debug --coverage no-asm enable-rc5 enable-md2 enable-ec_nistp_64_gcc_128 enable-ssl3 enable-ssl3-method enable-nextprotoneg enable-weak-ssl-ciphers no-shared -DPEDANTIC -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION" COVERALLS="yes" BORINGSSL_TESTS="yes" CXX="g++-5"
+        - os: linux
+          addons:
+              apt:
+                  packages:
+                      - gcc-5
+                      - g++-5
+                  sources:
+                      - ubuntu-toolchain-r-test
+          compiler: gcc-5
+          env:  EXTENDED_TEST="yes" CONFIG_OPTS="--debug enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers enable-external-tests" BORINGSSL_TESTS="yes" CXX="g++-5" TESTS=95
         - os: linux
           addons:
               apt:
diff --git a/test/recipes/95-test_external_pyca.t b/test/recipes/95-test_external_pyca.t
index 7ced77e..a64afd0 100644
--- a/test/recipes/95-test_external_pyca.t
+++ b/test/recipes/95-test_external_pyca.t
@@ -23,6 +23,8 @@ SKIP: {
         if ! -f srctop_file("pyca-cryptography", "setup.py");
     skip "PYCA tests not available on Windows or VMS", 1
         if $^O =~ /^(VMS|MSWin32)$/;
+    skip "PYCA tests only available in a shared build", 1
+        if disabled("shared");
 
     ok(run(cmd(["sh", data_file("cryptography.sh")])),
         "running Python Cryptography tests");
diff --git a/test/recipes/95-test_external_pyca_data/cryptography.sh b/test/recipes/95-test_external_pyca_data/cryptography.sh
index 34d1a8a..912dd35 100755
--- a/test/recipes/95-test_external_pyca_data/cryptography.sh
+++ b/test/recipes/95-test_external_pyca_data/cryptography.sh
@@ -44,7 +44,7 @@ virtualenv venv-pycrypto
 
 cd pyca-cryptography
 
-pip install -q --requirement dev-requirements.txt
+pip install .[test]
 
 echo "------------------------------------------------------------------"
 echo "Building cryptography"