Change 14902: [PATCH] assorted VMS test fix-ups, $Config{prefixexp} revisited

[Jarkko Hietaniemi]

Change 14902 by jhi@alpha on 2002/02/27 21:17:38

        Subject: [PATCH] assorted VMS test fix-ups, $Config{prefixexp} revisited
        From: "Craig A. Berry" <[EMAIL PROTECTED]>
        Date: Wed, 27 Feb 2002 15:36:38 -0600
        Message-Id: <5.1.0.14.2.20020227152131.01ade728@exchi01>

Affected files ...

.... //depot/perl/configure.com#141 edit
.... //depot/perl/ext/Cwd/t/cwd.t#7 edit
.... //depot/perl/lib/ExtUtils/t/Installed.t#7 edit
.... //depot/perl/vms/ext/filespec.t#16 edit

Differences ...

==== //depot/perl/configure.com#141 (text) ====
Index: perl/configure.com
--- perl/configure.com.~1~      Wed Feb 27 14:30:05 2002
+++ perl/configure.com  Wed Feb 27 14:30:05 2002
@@ -5622,7 +5622,7 @@
 $ WC "pidtype='" + pidtype + "'"
 $ WC "pm_apiversion='" + version + "'"
 $ WC "prefix='" + vms_prefix + "'"
-$ WC "prefixexp='" + vms_prefix + "'"
+$ WC "prefixexp='" + vms_prefix + ":'"
 $ WC "privlib='" + privlib + "'"
 $ WC "privlibexp='" + privlibexp + "'"
 $ WC "procselfexe=' '"

==== //depot/perl/ext/Cwd/t/cwd.t#7 (text) ====
Index: perl/ext/Cwd/t/cwd.t
--- perl/ext/Cwd/t/cwd.t.~1~    Wed Feb 27 14:30:05 2002
+++ perl/ext/Cwd/t/cwd.t        Wed Feb 27 14:30:05 2002
@@ -65,9 +65,9 @@
 my $want = "t/$Test_Dir";
 if( $IsVMS ) {
     # translate the unixy path to VMSish
-    $want = uc $want;
     $want =~ s|/|\.|g;
     $want .= '\]';
+    $want = '((?i)' . $want . ')';  # might be ODS-2 or ODS-5
 }
 
 mkpath(["$Test_Dir"], 0, 0777);
@@ -94,7 +94,7 @@
 rmtree([$Top_Test_Dir], 0, 0);
 
 if ($IsVMS) {
-    like($ENV{PWD}, qr|\bT\]$|);
+    like($ENV{PWD}, qr|\b((?i)t)\]$|);
 }
 else {
     like($ENV{PWD}, qr|\bt$|);

==== //depot/perl/lib/ExtUtils/t/Installed.t#7 (text) ====
Index: perl/lib/ExtUtils/t/Installed.t
--- perl/lib/ExtUtils/t/Installed.t.~1~ Wed Feb 27 14:30:05 2002
+++ perl/lib/ExtUtils/t/Installed.t     Wed Feb 27 14:30:05 2002
@@ -108,8 +108,12 @@
 
 
 SKIP: {
+    TODO: {
        skip("could not write packlist: $!", 3 ) unless $wrotelist;
 
+       local $TODO = "new() attempts to derive package name from filename"
+           if $^O eq 'VMS';
+
        # avoid warning and death by localizing glob
        local *ExtUtils::Installed::Config;
        my $fake_mod_dir = File::Spec->catdir(cwd(), 'auto', 'FakeMod');
@@ -126,6 +130,7 @@
        isa_ok( $realei->{FakeMod}{packlist}, 'ExtUtils::Packlist' );
        is( $realei->{FakeMod}{version}, '1.1.1', 
                '... should find version in modules' );
+    }
 }
 
 # modules
@@ -169,7 +174,7 @@
 is( scalar @files, 0, '... should find no doc files given wrong dirs' );
 @files = $ei->files('goodmod', 'prog');
 is( scalar @files, 1, '... should find doc file in correct dir' );
-like( $files[0], qr/foobar$/, '... checking file name' );
+like( $files[0], qr/foobar[>\]]?$/, '... checking file name' );
 @files = $ei->files('goodmod');
 is( scalar @files, 2 + $mandirs, '... should find all files with no type specified' );
 my %dirnames = map { lc($_) => dirname($_) } @files;

==== //depot/perl/vms/ext/filespec.t#16 (text) ====
Index: perl/vms/ext/filespec.t
--- perl/vms/ext/filespec.t.~1~ Wed Feb 27 14:30:05 2002
+++ perl/vms/ext/filespec.t     Wed Feb 27 14:30:05 2002
@@ -30,7 +30,7 @@
 # file specifications shwn above are in fact equivalent.
 EOW
 
-is(rmsexpand('[]'),       "\U$ENV{DEFAULT}", 'rmsexpand()') || print $defwarn;
+is(uc(rmsexpand('[]')),   "\U$ENV{DEFAULT}", 'rmsexpand()') || print $defwarn;
 is(rmsexpand('from.here'),"\L$ENV{DEFAULT}from.here") || print $defwarn;
 is(rmsexpand('from'),     "\L$ENV{DEFAULT}from")      || print $defwarn;
 
End of Patch.