tweak warnings.t and kill_perl.t for VMS

Message-Id: <5.1.0.14.0.20010905145002.02b45218@exchi01>

p4raw-id: //depot/perl@11894

diff --git a/lib/warnings.t b/lib/warnings.t
index adc3ec9..d234a98 100644 (file)
--- a/lib/warnings.t
+++ b/lib/warnings.t
@@ -101,7 +101,13 @@ for (@prgs){
     $results =~ s/\n+$//;
     # allow expected output to be written as if $prog is on STDIN
     $results =~ s/tmp\d+/-/g;
-    $results =~ s/\n%[A-Z]+-[SIWEF]-.*$// if $Is_VMS;  # clip off DCL status msg
+    if ($^O eq 'VMS') {
+        # some tests will trigger VMS messages that won't be expected
+        $results =~ s/\n?%[A-Z]+-[SIWEF]-[A-Z]+,.*//;
+
+        # pipes double these sometimes
+        $results =~ s/\n\n/\n/g;
+    }
 # bison says 'parse error' instead of 'syntax error',
 # various yaccs may or may not capitalize 'syntax'.
     $results =~ s/^(syntax|parse) error/syntax error/mig;

diff --git a/t/run/kill_perl.t b/t/run/kill_perl.t
index 07df048..fa3bbec 100644 (file)
--- a/t/run/kill_perl.t
+++ b/t/run/kill_perl.t
@@ -89,7 +89,13 @@ foreach my $prog (@prgs) {
     # various yaccs may or may not capitalize 'syntax'.
     $results =~ s/^(syntax|parse) error/syntax error/mig;
 
-    $results =~ s/\n\n/\n/ if $^O eq 'VMS'; # pipes double these sometimes
+    if ($^O eq 'VMS') {
+        # some tests will trigger VMS messages that won't be expected
+        $results =~ s/\n?%[A-Z]+-[SIWEF]-[A-Z]+,.*//;
+
+        # pipes double these sometimes
+        $results =~ s/\n\n/\n/g;
+    }
 
     $expected =~ s/\n+$//;
     my $ok = $results eq $expected;