diff options
| author | Craig A. Berry <craigberry@mac.com> | 2002-02-27 09:36:38 -0600 |
|---|---|---|
| committer | Jarkko Hietaniemi <jhi@iki.fi> | 2002-02-27 21:17:38 +0000 |
| commit | b4558e5933d6def23121d1604bcf78459fa609fe (patch) | |
| tree | 190fe434e1c2c6e47a5cdbfb295bd9b41d4477a6 | |
| parent | a0457be16b8088455208a5b5ab035da17cb9f707 (diff) | |
| download | perl-b4558e5933d6def23121d1604bcf78459fa609fe.tar.gz | |
assorted VMS test fix-ups, $Config{prefixexp} revisited
From: "Craig A. Berry" <craigberry@mac.com>
Message-Id: <5.1.0.14.2.20020227152131.01ade728@exchi01>
p4raw-id: //depot/perl@14902
| -rw-r--r-- | configure.com | 2 | ||||
| -rw-r--r-- | ext/Cwd/t/cwd.t | 4 | ||||
| -rw-r--r-- | lib/ExtUtils/t/Installed.t | 7 | ||||
| -rw-r--r-- | vms/ext/filespec.t | 2 |
4 files changed, 10 insertions, 5 deletions
diff --git a/configure.com b/configure.com index b4b8848b89..76c137b5ad 100644 --- a/configure.com +++ b/configure.com @@ -5622,7 +5622,7 @@ $ WC "pgflquota='" + pgflquota + "'" $ 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=' '" diff --git a/ext/Cwd/t/cwd.t b/ext/Cwd/t/cwd.t index 8fc61b85fa..919cfb1527 100644 --- a/ext/Cwd/t/cwd.t +++ b/ext/Cwd/t/cwd.t @@ -65,9 +65,9 @@ my $Test_Dir = "$Top_Test_Dir/_path_/_to_/_a_/_dir_"; 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 @@ print "#$ENV{PWD}\n"; 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$|); diff --git a/lib/ExtUtils/t/Installed.t b/lib/ExtUtils/t/Installed.t index 70287f8e5f..1a7eaa110e 100644 --- a/lib/ExtUtils/t/Installed.t +++ b/lib/ExtUtils/t/Installed.t @@ -108,8 +108,12 @@ FAKE 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 @@ SKIP: { isa_ok( $realei->{FakeMod}{packlist}, 'ExtUtils::Packlist' ); is( $realei->{FakeMod}{version}, '1.1.1', '... should find version in modules' ); + } } # modules @@ -169,7 +174,7 @@ SKIP: { 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; diff --git a/vms/ext/filespec.t b/vms/ext/filespec.t index 7a68f59845..7123ffc51c 100644 --- a/vms/ext/filespec.t +++ b/vms/ext/filespec.t @@ -30,7 +30,7 @@ $defwarn = <<'EOW'; # 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; |