Commit 102c9e12 authored by Richard Levitte's avatar Richard Levitte
Browse files

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: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4040)
parent 735e3505

Configure

+1 −1
Original line number Diff line number Diff line
@@ -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.

test/build.info

+1 −1
Original line number Diff line number Diff line
@@ -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",

test/recipes/15-test_ecparam.t

+1 −1
Original line number Diff line number Diff line
@@ -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;

test/recipes/40-test_rehash.t

+1 −1
Original line number Diff line number Diff line
@@ -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");

test/recipes/80-test_ssl_new.t

+1 −1
Original line number Diff line number Diff line
@@ -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/;