Opening dirhandle DIR also as a file needs no warnings 'deprecated';

[p5sagit/p5-mst-13.2.git] / t / op / defins.t

diff --git a/t/op/defins.t b/t/op/defins.t
old mode 100755 (executable)
new mode 100644 (file)
index 9f1d128..1e8beb0
--- a/t/op/defins.t
+++ b/t/op/defins.t
@@ -12,8 +12,29 @@ BEGIN {
 require 'test.pl';
 plan( tests => 19 );
 
-$wanted_filename = $^O eq 'VMS' ? '0.' : '0';
-$saved_filename = $^O eq 'MacOS' ? ':0' : './0';
+my $unix_mode = 1;
+
+if ($^O eq 'VMS') {
+    # We have to know if VMS is in UNIX mode.  In UNIX mode, trailing dots
+    # should not be present.  There are actually two settings that control this.
+
+    $unix_mode = 0;
+    my $unix_rpt = 0;
+    my $drop_dot = 0;
+    if (eval 'require VMS::Feature') {
+        $unix_rpt = VMS::Feature::current('filename_unix_report');
+        $drop_dot = VMS::Feature::current('readdir_dropdotnotype');
+    } else {
+        my $unix_report = $ENV{'DECC$FILENAME_UNIX_REPORT'} || '';
+        $unix_rpt = $unix_report =~ /^[ET1]/i; 
+        my $drop_dot_notype = $ENV{'DECC$READDIR_DROPDOTNOTYPE'} || '';
+        $drop_dot = $drop_dot_notype =~ /^[ET1]/i;
+    }
+    $unix_mode = 1 if $drop_dot && unix_rpt;
+}
+
+$wanted_filename = $unix_mode ? '0' : '0.';
+$saved_filename = './0';
 
 cmp_ok($warns,'==',0,'no warns at start');
 
@@ -60,7 +81,7 @@ while ($where{$seen} = <FILE>)
 cmp_ok($seen,'==',1,'seen in hash while()');
 close FILE;
 
-opendir(DIR,($^O eq 'MacOS' ? ':' : '.'));
+opendir(DIR,'.');
 ok(defined(DIR),'opened current directory');
 $seen = 0;
 while (my $name = readdir(DIR))