More robust yacc/bison failure output handling.

p4raw-id: //depot/cfgperl@2011

3 files changed, 9 insertions, 3 deletions

diff --git a/t/comp/require.t b/t/comp/require.t
index 4120bb1ea5..1959326281 100755
--- a/t/comp/require.t
+++ b/t/comp/require.t
@@ -35,7 +35,9 @@ print "ok ",$i++,"\n";
 
 # compile-time failure in require
 do_require "1)\n";
-print "# $@\nnot " unless $@ =~ /syntax error/i;
+# bison says 'parser error' instead of 'syntax error',
+# various yaccs may or may not capitalize 'syntax'.
+print "# $@\nnot " unless $@ =~ /(syntax|parser) error/i;
 print "ok ",$i++,"\n";
 
 # successful require
diff --git a/t/op/misc.t b/t/op/misc.t
index 667db989bf..b924f89847 100755
--- a/t/op/misc.t
+++ b/t/op/misc.t
@@ -36,7 +36,9 @@ for (@prgs){
     $status = $?;
     $results = `$CAT $tmpfile`;
     $results =~ s/\n+$//;
-    $results =~ s/syntax error/syntax error/i;
+# bison says 'parser error' instead of 'syntax error',
+# various yaccs may or may not capitalize 'syntax'.
+    $results =~ s/^(syntax|parser) error/\L$1 error/i;
     $expected =~ s/\n+$//;
     if ( $results ne $expected){
 	print STDERR "PROG: $switch\n$prog\n";
diff --git a/t/pragma/subs.t b/t/pragma/subs.t
index 680564f843..58b53ae293 100755
--- a/t/pragma/subs.t
+++ b/t/pragma/subs.t
@@ -55,7 +55,9 @@ for (@prgs){
     # 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
-    $results =~ s/Syntax/syntax/;  # non-standard yacc
+# bison says 'parser error' instead of 'syntax error',
+# various yaccs may or may not capitalize 'syntax'.
+    $results =~ s/^(syntax|parser) error/\L$1 error/i;
     $expected =~ s/\n+$//;
     my $prefix = ($results =~ s/^PREFIX\n//) ;
     if ( $results =~ s/^SKIPPED\n//) {