The branch master has been updated
via 26810b5eaffad3fa6d320600d8ea36e2ed86ff7c (commit)
from b3696a55a5ed80717723a589020af30adb5db606 (commit)
- Log -----------------------------------------------------------------
commit 26810b5eaffad3fa6d320600d8ea36e2ed86ff7c
Author: Andy Polyakov <[email protected]>
Date: Fri Sep 1 23:13:28 2017 +0200
test/run_tests.pl: don't use Module::Load::Conditional.
Ironically enough not all installations get Module::Load::Conditional
installed by default... [It's a bit half-hearted, because such
installations are likely to lack more stuffi that is needed, but
nevertheless, it proved to be helpful.]
Reviewed-by: Rich Salz <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/4323)
-----------------------------------------------------------------------
Summary of changes:
test/run_tests.pl | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/test/run_tests.pl b/test/run_tests.pl
index 9f517da..6343ec7 100644
--- a/test/run_tests.pl
+++ b/test/run_tests.pl
@@ -19,10 +19,9 @@ use File::Basename;
use FindBin;
use lib "$FindBin::Bin/../util/perl";
use OpenSSL::Glob;
-use Module::Load::Conditional qw(can_load);
-my $TAP_Harness = can_load(modules => { 'TAP::Harness' => undef })
- ? 'TAP::Harness' : 'OpenSSL::TAP::Harness';
+my $TAP_Harness = eval { require TAP::Harness } ? "TAP::Harness"
+ : "OpenSSL::TAP::Harness";
my $srctop = $ENV{SRCTOP} || $ENV{TOP};
my $bldtop = $ENV{BLDTOP} || $ENV{TOP};
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
