regen/mk_invlists.pl: Allow enums/defines to be in re_comp.c

[perl5.git] / lib / blib.t

diff --git a/lib/blib.t b/lib/blib.t
index b6df9e8..2ad9827 100644 (file)
--- a/lib/blib.t
+++ b/lib/blib.t
@@ -9,9 +9,27 @@ use strict;
 use File::Spec;
 my($blib, $blib_arch, $blib_lib, @blib_dirs);
 
+my $Is_VMS   = $^O eq 'VMS';
+my $Is_VMS_mode = 0;
+
+if ($Is_VMS) {
+    require VMS::Filespec if $Is_VMS;
+    my $vms_unix_rpt;
+
+    $Is_VMS_mode = 1;
+    if (eval 'require VMS::Feature') {
+        $vms_unix_rpt = VMS::Feature::current("filename_unix_report");
+    } else {
+        my $unix_rpt = $ENV{'DECC$FILENAME_UNIX_REPORT'} || '';
+        $vms_unix_rpt = $unix_rpt =~ /^[ET1]/i; 
+    }
+    $Is_VMS_mode = 0 if ($vms_unix_rpt);
+}
+
+
 sub _cleanup {
     rmdir foreach reverse (@_);
-    unlink "stderr" unless $^O eq 'MacOS';
+    unlink "stderr";
 }
 
 sub _mkdirs {
@@ -23,21 +41,10 @@ sub _mkdirs {
     
 
 BEGIN {
-    if ($^O eq 'MacOS')
-    {
-       $MacPerl::Architecture = $MacPerl::Architecture; # shhhhh
-       $blib = ":blib:";
-       $blib_lib = ":blib:lib:";
-       $blib_arch = ":blib:lib:$MacPerl::Architecture:";
-       @blib_dirs = ($blib, $blib_lib, $blib_arch); # order
-    }
-    else
-    {
-       $blib = "blib";
-       $blib_arch = "blib/arch";
-       $blib_lib = "blib/lib";
-       @blib_dirs = ($blib, $blib_arch, $blib_lib);
-    }
+    $blib = "blib";
+    $blib_arch = "blib/arch";
+    $blib_lib = "blib/lib";
+    @blib_dirs = ($blib, $blib_arch, $blib_lib);
     _cleanup( @blib_dirs );
 }
 
@@ -58,13 +65,13 @@ _mkdirs( @blib_dirs );
 is( @INC, 3, '@INC now has 3 elements' );
 is( $INC[2],    '../lib',       'blib added to the front of @INC' );
 
-if ($^O eq 'VMS') {
+if ($Is_VMS_mode) {
     # Unix syntax is accepted going in but it's not what comes out
     # So we don't use catdir above
     $blib_arch = 'blib.arch]';
     $blib_lib = 'blib.lib]';
 }
-elsif ($^O ne 'MacOS')
+else
 {
     $blib_arch = File::Spec->catdir("blib","arch");
     $blib_lib  = File::Spec->catdir("blib","lib");