[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  2dc4be513b1ab59cce3f578488a870124dcff1b8 (commit)
      from  cf2cede4a75f5e269f791bf1dcc029bba8c1f689 (commit)


- Log -----------------------------------------------------------------
commit 2dc4be513b1ab59cce3f578488a870124dcff1b8
Author: Richard Levitte <levitte at openssl.org>
Date:   Sun Jan 24 16:23:55 2016 +0100

    Fix OpenSSL::Test::Simple to take more than one algorithm
    
    Some test programs may depend on more than just one TLS version, for
    example.
    
    Reviewed-by: Viktor Dukhovni <viktor at openssl.org>

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

Summary of changes:
 test/testlib/OpenSSL/Test/Simple.pm | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/test/testlib/OpenSSL/Test/Simple.pm b/test/testlib/OpenSSL/Test/Simple.pm
index dfae026..b596e5f 100644
--- a/test/testlib/OpenSSL/Test/Simple.pm
+++ b/test/testlib/OpenSSL/Test/Simple.pm
@@ -17,7 +17,7 @@ OpenSSL::Test::Simple - a few very simple test functions
 
   use OpenSSL::Test::Simple;
 
-  simple_test("my_test_name", "des", "destest");
+  simple_test("my_test_name", "destest", "des");
 
 =head1 DESCRIPTION
 
@@ -52,12 +52,18 @@ A complete recipe looks like this:
 #  algorithm		(used to check if it's at all supported)
 #  name of binary	(the program that does the actual test)
 sub simple_test {
-    my ($name, $prgr, $algo, @rest) = @_;
+    my ($name, $prgr, @algos) = @_;
 
     setup($name);
 
-    plan skip_all => "$algo is not supported by this OpenSSL build"
-        if $algo && disabled($algo);
+    if (scalar(disabled(@algos))) {
+	if (scalar(@algos) == 1) {
+	    plan skip_all => $algos[0]." is not supported by this OpenSSL build";
+	} else {
+	    my $last = pop @algos;
+	    plan skip_all => join(", ", @algos)." and $last are not supported by this OpenSSL build";
+	}
+    }
 
     plan tests => 1;