diff options
| author | Richard Levitte <levitte@openssl.org> | 2017-11-03 21:22:17 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2017-11-05 22:57:06 +0100 |
| commit | b81cfa07ada850fd287d0a0c82ba280907f18ce7 (patch) | |
| tree | 796f74646a6e66c23af77d8c909bdb2327768437 /test | |
| parent | bcc096a50811bf0f0c4fd34b2993fed7a7015972 (diff) | |
Perl: Use our own globbing wrapper 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.
The first idea was to use a construction that makes the caller glob()
use File::Glob::bsd_glob(). That turned out not to work well
everywhere, so instead, we make our own wrapper, OpenSSL::Glob and use
that.
Fixes #4636
(this is an adaptation of #4040 and part of #4069, for 1.1.0)
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4666)
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 | 3 | ||||
| -rw-r--r-- | test/run_tests.pl | 4 |
4 files changed, 6 insertions, 5 deletions
diff --git a/test/build.info b/test/build.info index ef968e646a..0b52994a15 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 OpenSSL::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..1204f1f77f 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 OpenSSL::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 dbd6aeb57a..6f22a5aa35 100644 --- a/test/recipes/80-test_ssl_new.t +++ b/test/recipes/80-test_ssl_new.t @@ -12,8 +12,7 @@ use warnings; use File::Basename; use File::Compare qw/compare_text/; -use if $^O ne "VMS", 'File::Glob' => qw/glob/; - +use OpenSSL::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..1859e605b4 100644 --- a/test/run_tests.pl +++ b/test/run_tests.pl @@ -16,7 +16,9 @@ BEGIN { use File::Spec::Functions qw/catdir catfile curdir abs2rel rel2abs/; use File::Basename; -use if $^O ne "VMS", 'File::Glob' => qw/glob/; +use FindBin; +use lib "$FindBin::Bin/../util"; +use OpenSSL::Glob; use Module::Load::Conditional qw(can_load); my $TAP_Harness = can_load(modules => { 'TAP::Harness' => undef }) |