[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  60f9f1e1c821eea5bf6969e6eee578b1f0eccf9d (commit)
      from  bdb1d0c24b3df3e2253cd8289cd619093524464e (commit)


- Log -----------------------------------------------------------------
commit 60f9f1e1c821eea5bf6969e6eee578b1f0eccf9d
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Jan 13 03:53:47 2016 +0100

    VMS perl doesn't implement fork(), so don't run the TLSProxy tests there
    
    Reviewed-by: Viktor Dukhovni <viktor at openssl.org>

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

Summary of changes:
 test/recipes/70-test_sslcertstatus.t  | 3 +++
 test/recipes/70-test_sslextension.t   | 3 +++
 test/recipes/70-test_sslsessiontick.t | 3 +++
 test/recipes/70-test_sslskewith0p.t   | 3 +++
 test/recipes/70-test_sslvertol.t      | 3 +++
 test/recipes/70-test_tlsextms.t       | 3 +++
 6 files changed, 18 insertions(+)

diff --git a/test/recipes/70-test_sslcertstatus.t b/test/recipes/70-test_sslcertstatus.t
index 32e2680..0be0ccb 100755
--- a/test/recipes/70-test_sslcertstatus.t
+++ b/test/recipes/70-test_sslcertstatus.t
@@ -59,6 +59,9 @@ use TLSProxy::Proxy;
 my $test_name = "test_sslcertstatus";
 setup($test_name);
 
+plan skip_all => "TLSProxy isn't usable on $^O"
+    if $^O =~ /^VMS$/;
+
 plan skip_all => "$test_name can only be performed with OpenSSL configured shared"
     unless (map { s/\R//; s/^SHARED_LIBS=\s*//; $_ }
         grep { /^SHARED_LIBS=/ }
diff --git a/test/recipes/70-test_sslextension.t b/test/recipes/70-test_sslextension.t
index bd99b19..f0b465d 100755
--- a/test/recipes/70-test_sslextension.t
+++ b/test/recipes/70-test_sslextension.t
@@ -59,6 +59,9 @@ use TLSProxy::Proxy;
 my $test_name = "test_sslextension";
 setup($test_name);
 
+plan skip_all => "TLSProxy isn't usable on $^O"
+    if $^O =~ /^VMS$/;
+
 plan skip_all => "$test_name can only be performed with OpenSSL configured shared"
     unless (map { s/\R//; s/^SHARED_LIBS=\s*//; $_ }
 	    grep { /^SHARED_LIBS=/ }
diff --git a/test/recipes/70-test_sslsessiontick.t b/test/recipes/70-test_sslsessiontick.t
index 9209fd7..4cac255 100755
--- a/test/recipes/70-test_sslsessiontick.t
+++ b/test/recipes/70-test_sslsessiontick.t
@@ -60,6 +60,9 @@ use File::Temp qw(tempfile);
 my $test_name = "test_sslsessiontick";
 setup($test_name);
 
+plan skip_all => "TLSProxy isn't usable on $^O"
+    if $^O =~ /^VMS$/;
+
 plan skip_all => "$test_name can only be performed with OpenSSL configured shared"
     unless (map { s/\R//; s/^SHARED_LIBS=\s*//; $_ }
 	    grep { /^SHARED_LIBS=/ }
diff --git a/test/recipes/70-test_sslskewith0p.t b/test/recipes/70-test_sslskewith0p.t
index b3c5dc1..b20157f 100755
--- a/test/recipes/70-test_sslskewith0p.t
+++ b/test/recipes/70-test_sslskewith0p.t
@@ -60,6 +60,9 @@ use TLSProxy::Proxy;
 my $test_name = "test_sslskewith0p";
 setup($test_name);
 
+plan skip_all => "TLSProxy isn't usable on $^O"
+    if $^O =~ /^VMS$/;
+
 plan skip_all => "$test_name can only be performed with OpenSSL configured shared"
     unless (map { s/\R//; s/^SHARED_LIBS=\s*//; $_ }
 	    grep { /^SHARED_LIBS=/ }
diff --git a/test/recipes/70-test_sslvertol.t b/test/recipes/70-test_sslvertol.t
index 78c6410..031dd9a 100755
--- a/test/recipes/70-test_sslvertol.t
+++ b/test/recipes/70-test_sslvertol.t
@@ -59,6 +59,9 @@ use TLSProxy::Proxy;
 my $test_name = "test_sslextension";
 setup($test_name);
 
+plan skip_all => "TLSProxy isn't usable on $^O"
+    if $^O =~ /^VMS$/;
+
 plan skip_all => "$test_name can only be performed with OpenSSL configured shared"
     unless (map { s/\R//; s/^SHARED_LIBS=\s*//; $_ }
 	    grep { /^SHARED_LIBS=/ }
diff --git a/test/recipes/70-test_tlsextms.t b/test/recipes/70-test_tlsextms.t
index cdda7f8..763f7e8 100644
--- a/test/recipes/70-test_tlsextms.t
+++ b/test/recipes/70-test_tlsextms.t
@@ -60,6 +60,9 @@ use File::Temp qw(tempfile);
 my $test_name = "test_tlsextms";
 setup($test_name);
 
+plan skip_all => "TLSProxy isn't usable on $^O"
+    if $^O =~ /^VMS$/;
+
 plan skip_all => "$test_name can only be performed with OpenSSL configured shared"
     unless (map { s/\R//; s/^SHARED_LIBS=\s*//; $_ }
         grep { /^SHARED_LIBS=/ }