diff options
| author | Richard Levitte <levitte@openssl.org> | 2017-08-01 22:43:56 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2017-08-15 11:31:18 +0200 |
| commit | 8d2214c0a49584044d96b80e846ac8f6df35a0ad (patch) | |
| tree | cfad073ef328f3983cece8b214a230a3819b6388 /test | |
| parent | Consolidate the locations where we have our internal perl modules (diff) | |
| download | openssl-8d2214c0a49584044d96b80e846ac8f6df35a0ad.tar.xz openssl-8d2214c0a49584044d96b80e846ac8f6df35a0ad.zip | |
File::Glob option ':bsd_glob' doesn't work everywhere, replace w/ a wrapper
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4069)
Diffstat (limited to 'test')
| -rw-r--r-- | test/build.info | 2 | ||||
| -rw-r--r-- | test/recipes/15-test_ecparam.t | 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/recipes/99-test_fuzz.t | 2 | ||||
| -rw-r--r-- | test/run_tests.pl | 4 |
6 files changed, 8 insertions, 7 deletions
diff --git a/test/build.info b/test/build.info index e7982605fe..6abd635231 100644 --- a/test/build.info +++ b/test/build.info @@ -461,7 +461,7 @@ ENDIF {- use File::Spec::Functions; use File::Basename; - use if $^O ne "VMS", 'File::Glob' => qw/:bsd_glob/; + use OpenSSL::Glob; my @nogo_headers = ( "asn1_mac.h", "__decc_include_prologue.h", diff --git a/test/recipes/15-test_ecparam.t b/test/recipes/15-test_ecparam.t index 0f9b70b4bc..47a1a4f20c 100644 --- a/test/recipes/15-test_ecparam.t +++ b/test/recipes/15-test_ecparam.t @@ -11,7 +11,7 @@ use strict; use warnings; use File::Spec; -use if $^O ne "VMS", 'File::Glob' => qw/:bsd_glob/; +use OpenSSL::Glob; use OpenSSL::Test qw/:DEFAULT data_file/; use OpenSSL::Test::Utils; diff --git a/test/recipes/40-test_rehash.t b/test/recipes/40-test_rehash.t index b374e598d1..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/:bsd_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 f86e50988e..1ab8ef8d78 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/:bsd_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/recipes/99-test_fuzz.t b/test/recipes/99-test_fuzz.t index a0493a50d6..9322ff7790 100644 --- a/test/recipes/99-test_fuzz.t +++ b/test/recipes/99-test_fuzz.t @@ -9,7 +9,7 @@ use strict; use warnings; -use if $^O ne "VMS", 'File::Glob' => qw/:bsd_glob/; +use OpenSSL::Glob; use OpenSSL::Test qw/:DEFAULT srctop_file/; use OpenSSL::Test::Utils; diff --git a/test/run_tests.pl b/test/run_tests.pl index 1171eec2f7..9f517da3a9 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/:bsd_glob/; +use FindBin; +use lib "$FindBin::Bin/../util/perl"; +use OpenSSL::Glob; use Module::Load::Conditional qw(can_load); my $TAP_Harness = can_load(modules => { 'TAP::Harness' => undef }) |