Commit ef6d11f7 authored by Richard Levitte's avatar Richard Levitte
Browse files

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 04011100.

Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
parent 89fb0fb2
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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.

+1 −1
Original line number Diff line number Diff line
@@ -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",
+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 if $^O ne "VMS", 'File::Glob' => qw/glob/;
use OpenSSL::Test qw/:DEFAULT srctop_file/;

setup("test_rehash");
+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/: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/;
+1 −1
Original line number Diff line number Diff line
@@ -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 }) 
Loading