diff options
| author | Andy Polyakov <appro@openssl.org> | 2017-09-01 23:13:28 +0200 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2017-09-02 20:20:51 +0200 |
| commit | 26810b5eaffad3fa6d320600d8ea36e2ed86ff7c (patch) | |
| tree | 446d606f0382a72aaa9af5a8ff90c0b647e59965 /test/run_tests.pl | |
| parent | b3696a55a5ed80717723a589020af30adb5db606 (diff) | |
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 <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4323)
Diffstat (limited to 'test/run_tests.pl')
| -rw-r--r-- | test/run_tests.pl | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/test/run_tests.pl b/test/run_tests.pl index 9f517da3a9..6343ec7bc3 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}; |