[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  f37c159aed4bca0b7d3ea4657c450826850c8e75 (commit)
      from  f4947bf10ed505f54dcae11fd028a3ec98ee4f3b (commit)


- Log -----------------------------------------------------------------
commit f37c159aed4bca0b7d3ea4657c450826850c8e75
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Aug 2 13:27:39 2016 +0200

    80-test_ssl_new.t: only skip on $no_tls if no other skip conditions defined
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 test/recipes/80-test_ssl_new.t | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/recipes/80-test_ssl_new.t b/test/recipes/80-test_ssl_new.t
index 941ace7..17e22f0 100644
--- a/test/recipes/80-test_ssl_new.t
+++ b/test/recipes/80-test_ssl_new.t
@@ -62,7 +62,7 @@ foreach my $conf (@conf_files) {
     subtest "Test configuration $conf" => sub {
         test_conf($conf,
                   $conf_dependent_tests{$conf} || $^O eq "VMS" ?  0 : 1,
-                  $skip{$conf} || $no_tls);
+                  defined($skip{$conf}) ? $skip{$conf} : $no_tls);
     }
 }