Change 11894 by jhi@alpha on 2001/09/05 22:43:26
Subject: [PATCH bleadperl] tweak warnings.t and kill_perl.t for VMS
From: "Craig A. Berry" <[EMAIL PROTECTED]>
Date: Wed, 05 Sep 2001 17:48:54 -0500
Message-Id: <5.1.0.14.0.20010905145002.02b45218@exchi01>
Affected files ...
... //depot/perl/lib/warnings.t#4 edit
... //depot/perl/t/run/kill_perl.t#5 edit
Differences ...
==== //depot/perl/lib/warnings.t#4 (text) ====
Index: perl/lib/warnings.t
--- perl/lib/warnings.t.~1~ Wed Sep 5 17:00:06 2001
+++ perl/lib/warnings.t Wed Sep 5 17:00:06 2001
@@ -101,7 +101,13 @@
$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;
==== //depot/perl/t/run/kill_perl.t#5 (text) ====
Index: perl/t/run/kill_perl.t
--- perl/t/run/kill_perl.t.~1~ Wed Sep 5 17:00:06 2001
+++ perl/t/run/kill_perl.t Wed Sep 5 17:00:06 2001
@@ -89,7 +89,13 @@
# 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;
End of Patch.
