diff options
| author | Richard Levitte <levitte@openssl.org> | 2017-08-03 17:19:13 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2017-08-03 17:21:15 +0200 |
| commit | ef6d11f76fba7c9d4da821947f67acc5d603b99d (patch) | |
| tree | 0a3101e8916ffb53491f45438a9a882159467dd2 | |
| parent | 89fb0fb2a5391bd6cfd78bd201616ee68b5f5d34 (diff) | |
Revert "Perl: Use File::Glob::bsd_glob rather than File::Glob::glob"
This needs more change that what is appropriate for the 1.1.0 branch.
This reverts commit 0401110073cd392602855f9b72af2ebec7909625.
Reviewed-by: Andy Polyakov <appro@openssl.org>
| -rwxr-xr-x | Configure | 2 | ||||
| -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 | ||||
| -rw-r--r-- | util/process_docs.pl | 2 |
6 files changed, 6 insertions, 6 deletions
@@ -14,7 +14,7 @@ use strict; use File::Basename; use File::Spec::Functions qw/:DEFAULT abs2rel rel2abs/; use File::Path qw/mkpath/; -use if $^O ne "VMS", 'File::Glob' => qw/:bsd_glob/; +use if $^O ne "VMS", 'File::Glob' => qw/glob/; # see INSTALL for instructions. diff --git a/test/build.info b/test/build.info index 8303947326..ef968e646a 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/:bsd_glob/; + use if $^O ne "VMS", 'File::Glob' => qw/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 b374e598d1..f902c238c0 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 if $^O ne "VMS", 'File::Glob' => qw/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 2009ecfea1..2f6a69a305 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/:bsd_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/; diff --git a/test/run_tests.pl b/test/run_tests.pl index 51d990092a..e5bc927e67 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/:bsd_glob/; +use if $^O ne "VMS", 'File::Glob' => qw/glob/; use Module::Load::Conditional qw(can_load); my $TAP_Harness = can_load(modules => { 'TAP::Harness' => undef }) diff --git a/util/process_docs.pl b/util/process_docs.pl index 191ec9edf4..073a3b7031 100644 --- a/util/process_docs.pl +++ b/util/process_docs.pl @@ -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/:bsd_glob/; +use if $^O ne "VMS", 'File::Glob' => qw/glob/; use Getopt::Long; use Pod::Usage; |