[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  920def7401f0cd68a2040409c134af3f3db7453b (commit)
      from  42e0ccdfe851c9a153d3e90746a2b8561dc9b1e3 (commit)


- Log -----------------------------------------------------------------
commit 920def7401f0cd68a2040409c134af3f3db7453b
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Feb 9 11:16:05 2016 +0100

    Update 90-test-networking.t to do the same checks as other TLSProxy tests
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

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

Summary of changes:
 test/recipes/90-test_networking.t | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/test/recipes/90-test_networking.t b/test/recipes/90-test_networking.t
index fb146dd..08160fa 100644
--- a/test/recipes/90-test_networking.t
+++ b/test/recipes/90-test_networking.t
@@ -59,10 +59,14 @@ use TLSProxy::Proxy;
 my $test_name = "test_networking";
 setup($test_name);
 
+plan skip_all => "TLSProxy isn't usable on $^O"
+    if $^O =~ /^VMS$/;
+
+plan skip_all => "$test_name needs the engine feature enabled"
+    if disabled("engine");
+
 plan skip_all => "$test_name can only be performed with OpenSSL configured shared"
-    unless (map { s/\R//; s/^SHARED_LIBS=\s*//; $_ }
-	    grep { /^SHARED_LIBS=/ }
-	    do { local @ARGV = ( bldtop_file("Makefile") ); <> })[0] ne "";
+    if disabled("shared");
 
 $ENV{OPENSSL_ENGINES} = bldtop_dir("engines");
 $ENV{OPENSSL_ia32cap} = '~0x200000200000000';