diff options
| -rw-r--r-- | ext/Devel/Peek/Peek.t | 10 | ||||
| -rw-r--r-- | ext/Filter/t/call.t | 2 | ||||
| -rw-r--r-- | lib/charnames.t | 9 | ||||
| -rw-r--r-- | t/run/switchI.t | 12 |
4 files changed, 23 insertions, 10 deletions
diff --git a/ext/Devel/Peek/Peek.t b/ext/Devel/Peek/Peek.t index 697ac4c679..687dff042a 100644 --- a/ext/Devel/Peek/Peek.t +++ b/ext/Devel/Peek/Peek.t @@ -433,8 +433,14 @@ do_test(21, MG_TYPE = PERL_MAGIC_envelem\\(e\\) (?: MG_FLAGS = 0x01 TAINTEDDIR -)? MG_LEN = 4 - MG_PTR = $ADDR "(?i:PATH)" +)? MG_LEN = -?\d+ + MG_PTR = $ADDR (?:"(?i:PATH)"|=> HEf_SVKEY + SV = PV\\($ADDR\\) at $ADDR + REFCNT = \d+ + FLAGS = \\(TEMP,POK,pPOK\\) + PV = $ADDR "(?i:PATH)"\\\0 + CUR = \d+ + LEN = \d+) MAGIC = $ADDR MG_VIRTUAL = &PL_vtbl_taint MG_TYPE = PERL_MAGIC_taint\\(t\\)'); diff --git a/ext/Filter/t/call.t b/ext/Filter/t/call.t index 0f9b452125..8dd0955941 100644 --- a/ext/Filter/t/call.t +++ b/ext/Filter/t/call.t @@ -806,10 +806,12 @@ EOM my $a = `$Perl "-I." $Inc -e "no ${module6}; print q{ok}"`; ok(29, ($? >>8) == 0); +chomp( $a ) if $^O eq 'VMS'; ok(30, $a eq 'ok'); $a = `$Perl "-I." $Inc $filename2`; ok(31, ($? >>8) == 0); +chomp( $a ) if $^O eq 'VMS'; ok(32, $a eq 'ok'); } diff --git a/lib/charnames.t b/lib/charnames.t index b2c1636789..97663a7d1e 100644 --- a/lib/charnames.t +++ b/lib/charnames.t @@ -6,6 +6,7 @@ BEGIN { unless(grep /blib/, @INC) { chdir 't' if -d 't'; @INC = '../lib'; + require './test.pl'; } $SIG{__WARN__} = sub { push @WARN, @_ }; } @@ -292,11 +293,9 @@ for (@prgs) { print $ali $fil; close $ali or die "Could not close $alifile: $!"; } - my $res = - $^O eq "MSWin32" ? `.\\perl -I../lib $switch $tmpfile 2>&1` : - $^O eq "NetWare" ? `perl -I../lib $switch $tmpfile 2>&1` : - $^O eq "MacOS" ? `$^X -I::lib -MMac::err=unix $switch $tmpfile` : - `./perl -I. -I../lib $switch $tmpfile 2>&1`; + my $res = runperl( switches => $switch, + progfile => $tmpfile, + stderr => 1 ); my $status = $?; $res =~ s/[\r\n]+$//; $res =~ s/tmp\d+/-/g; # fake $prog from STDIN diff --git a/t/run/switchI.t b/t/run/switchI.t index fa74b9435e..fcd2dc00f2 100644 --- a/t/run/switchI.t +++ b/t/run/switchI.t @@ -11,9 +11,15 @@ BEGIN { } ok(grep { $_ eq 'Bla' } @INC); -ok(grep { $_ eq 'Foo::Bar' } @INC); +SKIP: { + skip 'Double colons not allowed in dir spec', 1 if $^O eq 'VMS'; + ok(grep { $_ eq 'Foo::Bar' } @INC); +} fresh_perl_is('print grep { $_ eq "Bla2" } @INC', 'Bla2', { switches => ['-IBla2'] }, '-I'); -fresh_perl_is('print grep { $_ eq "Foo::Bar2" } @INC', 'Foo::Bar2', - { switches => ['-IFoo::Bar2'] }, '-I with colons'); +SKIP: { + skip 'Double colons not allowed in dir spec', 1 if $^O eq 'VMS'; + fresh_perl_is('print grep { $_ eq "Foo::Bar2" } @INC', 'Foo::Bar2', + { switches => ['-IFoo::Bar2'] }, '-I with colons'); +} |