[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  49dc5404dfbaaa52baeef43879f0d3f9bae582d0 (commit)
      from  57a143fd83bc0bed49a1eeeef8ab089ffad8a4fe (commit)


- Log -----------------------------------------------------------------
commit 49dc5404dfbaaa52baeef43879f0d3f9bae582d0
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Jan 27 18:31:08 2016 +0100

    Skip all explicitely if the number of tests is 0
    
    It seems that Test::More doesn't like 0 tests, a line like this raises
    an error and stops the recipe entirely:
    
        plan tests => 0;
    
    So we need to check for 0 tests beforehand and skip the subtest
    explicitely in that case.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

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

diff --git a/test/recipes/80-test_ssl.t b/test/recipes/80-test_ssl.t
index bcac431..4039654 100644
--- a/test/recipes/80-test_ssl.t
+++ b/test/recipes/80-test_ssl.t
@@ -470,6 +470,9 @@ sub testssl {
 		  $protocolciphersuitcount += scalar @c;
 		  $_ => [ @c ] } @protocols;
 
+        plan skip_all => "None of the ciphersuites to test are available in this OpenSSL build"
+            if $protocolciphersuitcount + scalar(@protocols) == 0;
+
         # The count of protocols is because in addition to the ciphersuits
         # we got above, we're running a weak DH test for each protocol
 	plan tests => $protocolciphersuitcount + scalar(@protocols);