Commit 8d2214c0 authored Aug 01, 2017 by Richard Levitte

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)

parent cb6afcd6

Configure

+1 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,7 @@ use lib "$FindBin::Bin/util/perl";
		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 OpenSSL::Glob;

		# see INSTALL for instructions.

test/build.info

+1 −1

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

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/:bsd_glob/;
		use OpenSSL::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/:bsd_glob/;
		use OpenSSL::Glob;
		use OpenSSL::Test qw/:DEFAULT srctop_file/;

		setup("test_rehash");

test/recipes/80-test_ssl_new.t

+1 −2

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