diff options
| author | Richard Levitte <levitte@openssl.org> | 2017-07-28 13:38:03 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2017-07-28 14:47:55 +0200 |
| commit | 0401110073cd392602855f9b72af2ebec7909625 (patch) | |
| tree | 8e93489c7fb139ec4a6f38408063a2f58b4ac5a8 /test | |
| parent | 574496c0537ac12b3e313fbcfe271e5e609388ae (diff) | |
Perl: Use File::Glob::bsd_glob rather than File::Glob::glob
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)
(cherry picked from commit 102c9e1296b656c4049c1110abc8a52b43bd0dcf)
Diffstat (limited to 'test')
| -rw-r--r-- | test/build.info | 2 | ||||
| -rw-r--r-- | test/recipes/40-test_rehash.t | 2 | ||||
| -rw-r--r-- | test/recipes/80-test_ssl_new.t | 2 | ||||
| -rw-r--r-- | test/run_tests.pl | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/test/build.info b/test/build.info index ef968e646a..8303947326 100644 --- a/test/build.info +++ b/test/build.info @@ -293,7 +293,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", diff --git a/test/recipes/40-test_rehash.t b/test/recipes/40-test_rehash.t index f902c238c0..b374e598d1 100644 --- a/test/recipes/40-test_rehash.t +++ b/test/recipes/40-test_rehash.t @@ -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"); diff --git a/test/recipes/80-test_ssl_new.t b/test/recipes/80-test_ssl_new.t index 2f6a69a305..2009ecfea1 100644 --- a/test/recipes/80-test_ssl_new.t +++ b/test/recipes/80-test_ssl_new.t @@ -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/; diff --git a/test/run_tests.pl b/test/run_tests.pl index e5bc927e67..51d990092a 100644 --- a/test/run_tests.pl +++ b/test/run_tests.pl @@ -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 }) |