[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  418bb7b31bb7cfca6e419a5aa7bf161784f61059 (commit)
      from  e3d378bcf1324fb6958366f21539e1e0533225f1 (commit)


- Log -----------------------------------------------------------------
commit 418bb7b31bb7cfca6e419a5aa7bf161784f61059
Author: Rainer Jung <rainer.jung at kippdata.de>
Date:   Thu May 25 23:58:14 2017 +0200

    Fix use of "can_load()" in run_tests.pl.
    
    CLA: Trivial
    
    Fixes #3563.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3564)

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

Summary of changes:
 test/run_tests.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/run_tests.pl b/test/run_tests.pl
index a04fd98..a91d761 100644
--- a/test/run_tests.pl
+++ b/test/run_tests.pl
@@ -19,7 +19,7 @@ use File::Basename;
 use if $^O ne "VMS", 'File::Glob' => qw/glob/;
 use Module::Load::Conditional qw(can_load);
 
-my $TAP_Harness = can_load({modules => [ 'TAP::Harness' ]})
+my $TAP_Harness = can_load(modules => { 'TAP::Harness' => undef }) 
     ? 'TAP::Harness' : 'OpenSSL::TAP::Harness';
 
 my $srctop = $ENV{SRCTOP} || $ENV{TOP};