[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  835894d1383ac23b910d581144c35214591a445a (commit)
      from  aa50e2a39d9e9ec3226d0b33feaf98198e779d47 (commit)


- Log -----------------------------------------------------------------
commit 835894d1383ac23b910d581144c35214591a445a
Author: Todd Short <tshort at akamai.com>
Date:   Mon Jan 25 12:44:15 2016 -0500

    RT4272: Unit tests fail when DTLS disabled
    
    Missing SKIP: block in SSL unit tests for DTLS and TLS version tests.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 test/recipes/80-test_ssl.t | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/recipes/80-test_ssl.t b/test/recipes/80-test_ssl.t
index e7472a2..d0bb79a 100644
--- a/test/recipes/80-test_ssl.t
+++ b/test/recipes/80-test_ssl.t
@@ -657,6 +657,7 @@ sub testssl {
         my $n = ((@protos+2) * (@protos+3))/2 - 2;
         my $ntests = $n * $n;
 	plan tests => $ntests;
+      SKIP: {
         skip "TLS disabled", 1 if $ntests == 1;
 
         my $should;
@@ -690,7 +691,7 @@ sub testssl {
                 print STDERR "\nFailed: @args\n";
             }
             ok($ok);
-        }}}}
+        }}}}}
     };
 
     subtest 'DTLS Version min/max tests' => sub {
@@ -703,6 +704,7 @@ sub testssl {
         my $n = ((@protos+2) * (@protos+3))/2 - 2;
         my $ntests = $n * $n;
 	plan tests => $ntests;
+      SKIP: {
         skip "DTLS disabled", 1 if $ntests == 1;
 
         my $should;
@@ -736,7 +738,7 @@ sub testssl {
                 print STDERR "\nFailed: @args\n";
             }
             ok($ok);
-        }}}}
+        }}}}}
     };
 }