From 26810b5eaffad3fa6d320600d8ea36e2ed86ff7c Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Fri, 1 Sep 2017 23:13:28 +0200 Subject: [PATCH] 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 (Merged from https://github.com/openssl/openssl/pull/4323) --- 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 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}; -- 2.25.1