diff options
author | Richard Levitte <levitte@openssl.org> | 2016-05-30 11:20:37 +0200 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2016-05-30 11:55:46 +0200 |
commit | 23049aa52e2b4f12c2c2d7c7d80f5b1876a1b8ba (patch) | |
tree | c3cc4e455726e1456cdaeb09b60f3eef6c87be69 /test | |
parent | 453fc7a0185dcd046a8ab2b029e0807a073f93c2 (diff) |
perl: use the 'if' module to conditionally load File::Glob
Trying to use normal perl conditions to conditionally 'use' a perl
module didn't quite work. Using the 'if' module to do so does work.
Reviewed-by: Andy Polyakov <appro@openssl.org>
Diffstat (limited to 'test')
-rw-r--r-- | test/recipes/40-test_rehash.t | 4 | ||||
-rw-r--r-- | test/recipes/80-test_ssl_new.t | 4 | ||||
-rw-r--r-- | test/run_tests.pl | 4 |
3 files changed, 3 insertions, 9 deletions
diff --git a/test/recipes/40-test_rehash.t b/test/recipes/40-test_rehash.t index 201d1add13..fa05ca09fb 100644 --- a/test/recipes/40-test_rehash.t +++ b/test/recipes/40-test_rehash.t @@ -13,9 +13,7 @@ use warnings; use File::Spec::Functions; use File::Copy; use File::Basename; -if ($^O ne "VMS") { - use File::Glob qw/glob/; -} +use if $^O ne "VMS", 'File::Glob' => qw/glob/; use OpenSSL::Test qw/:DEFAULT bldtop_file/; setup("test_rehash"); diff --git a/test/recipes/80-test_ssl_new.t b/test/recipes/80-test_ssl_new.t index b9f3fa8e8d..2bce02aa49 100644 --- a/test/recipes/80-test_ssl_new.t +++ b/test/recipes/80-test_ssl_new.t @@ -12,9 +12,7 @@ use warnings; use File::Basename; use File::Compare qw/compare_text/; -if ($^O ne "VMS") { - use File::Glob qw/glob/; -} +use if $^O ne "VMS", 'File::Glob' => qw/glob/; use OpenSSL::Test qw/:DEFAULT srctop_dir srctop_file/; use OpenSSL::Test::Utils qw/disabled alldisabled available_protocols/; diff --git a/test/run_tests.pl b/test/run_tests.pl index b1084138dd..6550e0b272 100644 --- a/test/run_tests.pl +++ b/test/run_tests.pl @@ -16,9 +16,7 @@ BEGIN { use File::Spec::Functions qw/catdir catfile curdir abs2rel rel2abs/; use File::Basename; -if ($^O ne "VMS") { - use File::Glob qw/glob/; -} +use if $^O ne "VMS", 'File::Glob' => qw/glob/; use Test::Harness qw/runtests $switches/; my $srctop = $ENV{SRCTOP} || $ENV{TOP}; |