Fix a bunch of gcc warnings in packettest.c

[openssl.git] / test / run_tests.pl

diff --git a/test/run_tests.pl b/test/run_tests.pl
index 1171eec2f75ed1280018b5ffa057174a95946990..6343ec7bc3e0860ea38deeb7c9bc0eebfdc4ad5e 100644 (file)
--- a/test/run_tests.pl
+++ b/test/run_tests.pl
@@ -16,11 +16,12 @@ BEGIN {
 
 use File::Spec::Functions qw/catdir catfile curdir abs2rel rel2abs/;
 use File::Basename;
-use if $^O ne "VMS", 'File::Glob' => qw/:bsd_glob/;
-use Module::Load::Conditional qw(can_load);
+use FindBin;
+use lib "$FindBin::Bin/../util/perl";
+use OpenSSL::Glob;
 
-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};