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>
diff --git a/Configure b/Configure index 9e58fc1..020f2a1 100755 --- a/Configure +++ b/Configure
@@ -14,9 +14,7 @@ use File::Basename; use File::Spec::Functions qw/:DEFAULT abs2rel rel2abs/; use File::Path qw/mkpath/; -if ($^O ne "VMS") { - use File::Glob qw/glob/; -} +use if $^O ne "VMS", 'File::Glob' => qw/glob/; # see INSTALL for instructions.
diff --git a/test/recipes/40-test_rehash.t b/test/recipes/40-test_rehash.t index 201d1ad..fa05ca0 100644 --- a/test/recipes/40-test_rehash.t +++ b/test/recipes/40-test_rehash.t
@@ -13,9 +13,7 @@ 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 b9f3fa8..2bce02a 100644 --- a/test/recipes/80-test_ssl_new.t +++ b/test/recipes/80-test_ssl_new.t
@@ -12,9 +12,7 @@ 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 b108413..6550e0b 100644 --- a/test/run_tests.pl +++ b/test/run_tests.pl
@@ -16,9 +16,7 @@ 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};
diff --git a/util/process_docs.pl b/util/process_docs.pl index cf1d326..fe8589b 100644 --- a/util/process_docs.pl +++ b/util/process_docs.pl
@@ -13,9 +13,7 @@ use File::Basename; use File::Copy; use File::Path; -if ($^O ne "VMS") { - use File::Glob qw/glob/; -} +use if $^O ne "VMS", 'File::Glob' => qw/glob/; use Getopt::Long; use Pod::Usage;