wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

perl: use the 'if' module to conditionally load File::Glob

Browse source 
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>
This commit is contained in:
Richard Levitte 2016-05-30 11:20:37 +02:00
parent 453fc7a018
commit 23049aa52e
5 changed files with 5 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Configure
View file

@ -14,9 +14,7 @@ use strict;
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.

4
test/recipes/40-test_rehash.t
View file

@ -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");

4
test/recipes/80-test_ssl_new.t
View file

@ -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/;

4
test/run_tests.pl
View file

@ -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};

4
util/process_docs.pl
View file

@ -13,9 +13,7 @@ use File::Spec::Functions;
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;