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

Perl: Use File::Glob::bsd_glob rather than File::Glob::glob

Browse source 
File::Glob::glob is deprecated, it's use generates this kind of
message:

    File::Glob::glob() will disappear in perl 5.30. Use File::Glob::bsd_glob() instead. at ../master/Configure line 277.

So instead, use a construction that makes the caller glob() use
File::Glob::bsd_glob().

Note that we're still excluding VMS, as it's directory specs use '['
and ']', which have a different meaning with bsd_glob and would need
some extra quoting.  This might change, but later.

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4040)
This commit is contained in:
Richard Levitte 2017-07-28 13:38:03 +02:00
parent 735e350555
commit 102c9e1296
9 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Configure
View file

@ -15,7 +15,7 @@ use Config;
use File::Basename;
use File::Spec::Functions qw/:DEFAULT abs2rel rel2abs/;
use File::Path qw/mkpath/;
use if $^O ne "VMS", 'File::Glob' => qw/glob/;
use if $^O ne "VMS", 'File::Glob' => qw/:bsd_glob/;
# see INSTALL for instructions.

2
test/build.info
View file

@ -450,7 +450,7 @@ ENDIF
{-
use File::Spec::Functions;
use File::Basename;
use if $^O ne "VMS", 'File::Glob' => qw/glob/;
use if $^O ne "VMS", 'File::Glob' => qw/:bsd_glob/;
my @nogo_headers = ( "asn1_mac.h",
"__decc_include_prologue.h",

2
test/recipes/15-test_ecparam.t
View file

@ -11,7 +11,7 @@ use strict;
use warnings;
use File::Spec;
use if $^O ne "VMS", 'File::Glob' => qw/glob/;
use if $^O ne "VMS", 'File::Glob' => qw/:bsd_glob/;
use OpenSSL::Test qw/:DEFAULT data_file/;
use OpenSSL::Test::Utils;

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

@ -13,7 +13,7 @@ use warnings;
use File::Spec::Functions;
use File::Copy;
use File::Basename;
use if $^O ne "VMS", 'File::Glob' => qw/glob/;
use if $^O ne "VMS", 'File::Glob' => qw/:bsd_glob/;
use OpenSSL::Test qw/:DEFAULT srctop_file/;
setup("test_rehash");

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

@ -12,7 +12,7 @@ use warnings;
use File::Basename;
use File::Compare qw/compare_text/;
use if $^O ne "VMS", 'File::Glob' => qw/glob/;
use if $^O ne "VMS", 'File::Glob' => qw/:bsd_glob/;
use OpenSSL::Test qw/:DEFAULT srctop_dir srctop_file/;
use OpenSSL::Test::Utils qw/disabled alldisabled available_protocols/;

2
test/recipes/99-test_fuzz.t
View file

@ -9,7 +9,7 @@
use strict;
use warnings;
use if $^O ne "VMS", 'File::Glob' => qw/glob/;
use if $^O ne "VMS", 'File::Glob' => qw/:bsd_glob/;
use OpenSSL::Test qw/:DEFAULT srctop_file/;
use OpenSSL::Test::Utils;

2
test/run_tests.pl
View file

@ -16,7 +16,7 @@ BEGIN {
use File::Spec::Functions qw/catdir catfile curdir abs2rel rel2abs/;
use File::Basename;
use if $^O ne "VMS", 'File::Glob' => qw/glob/;
use if $^O ne "VMS", 'File::Glob' => qw/:bsd_glob/;
use Module::Load::Conditional qw(can_load);
my $TAP_Harness = can_load(modules => { 'TAP::Harness' => undef })

2
util/mkdef.pl
View file

@ -49,7 +49,7 @@ use lib ".";
use configdata;
use File::Spec::Functions;
use File::Basename;
use if $^O ne "VMS", 'File::Glob' => qw/glob/;
use if $^O ne "VMS", 'File::Glob' => qw/:bsd_glob/;
my $debug=0;

2
util/process_docs.pl
View file

@ -13,7 +13,7 @@ use File::Spec::Functions;
use File::Basename;
use File::Copy;
use File::Path;
use if $^O ne "VMS", 'File::Glob' => qw/glob/;
use if $^O ne "VMS", 'File::Glob' => qw/:bsd_glob/;
use Getopt::Long;
use Pod::Usage;