More robust yacc/bison failure output handling.

[p5sagit/p5-mst-13.2.git] / t / comp / redef.t

diff --git a/t/comp/redef.t b/t/comp/redef.t
index ad28bfd..07e978b 100755 (executable)
--- a/t/comp/redef.t
+++ b/t/comp/redef.t
@@ -13,6 +13,8 @@ sub ok ($$) {
 
 print "1..18\n";
 
+my $NEWPROTO = 'Prototype mismatch:';
+
 sub sub0 { 1 }
 sub sub0 { 2 }
 
@@ -21,19 +23,19 @@ ok 1, $warn =~ s/Subroutine sub0 redefined[^\n]+\n//s;
 sub sub1    { 1 }
 sub sub1 () { 2 }
 
-ok 2, $warn =~ s/Prototype mismatch: \Q(none) vs ()\E[^\n]+\n//s;
+ok 2, $warn =~ s/$NEWPROTO \Qsub main::sub1 vs ()\E[^\n]+\n//s;
 ok 3, $warn =~ s/Subroutine sub1 redefined[^\n]+\n//s;
 
 sub sub2     { 1 }
 sub sub2 ($) { 2 }
 
-ok 4, $warn =~ s/Prototype mismatch: \Q(none) vs ($)\E[^\n]+\n//s;
+ok 4, $warn =~ s/$NEWPROTO \Qsub main::sub2 vs ($)\E[^\n]+\n//s;
 ok 5, $warn =~ s/Subroutine sub2 redefined[^\n]+\n//s;
 
 sub sub3 () { 1 }
 sub sub3    { 2 }
 
-ok 6, $warn =~ s/Prototype mismatch: \Q() vs (none)\E[^\n]+\n//s;
+ok 6, $warn =~ s/$NEWPROTO \Qsub main::sub3 () vs none\E[^\n]+\n//s;
 ok 7, $warn =~ s/Constant subroutine sub3 redefined[^\n]+\n//s;
 
 sub sub4 () { 1 }
@@ -44,19 +46,19 @@ ok 8, $warn =~ s/Constant subroutine sub4 redefined[^\n]+\n//s;
 sub sub5 ()  { 1 }
 sub sub5 ($) { 2 }
 
-ok  9, $warn =~ s/Prototype mismatch: \Q() vs ($)\E[^\n]+\n//s;
+ok  9, $warn =~ s/$NEWPROTO \Qsub main::sub5 () vs ($)\E[^\n]+\n//s;
 ok 10, $warn =~ s/Constant subroutine sub5 redefined[^\n]+\n//s;
 
 sub sub6 ($) { 1 }
 sub sub6     { 2 }
 
-ok 11, $warn =~ s/Prototype mismatch: \Q($) vs (none)\E[^\n]+\n//s;
+ok 11, $warn =~ s/$NEWPROTO \Qsub main::sub6 ($) vs none\E[^\n]+\n//s;
 ok 12, $warn =~ s/Subroutine sub6 redefined[^\n]+\n//s;
 
 sub sub7 ($) { 1 }
 sub sub7 ()  { 2 }
 
-ok 13, $warn =~ s/Prototype mismatch: \Q($) vs ()\E[^\n]+\n//s;
+ok 13, $warn =~ s/$NEWPROTO \Qsub main::sub7 ($) vs ()\E[^\n]+\n//s;
 ok 14, $warn =~ s/Subroutine sub7 redefined[^\n]+\n//s;
 
 sub sub8 ($) { 1 }
@@ -67,7 +69,7 @@ ok 15, $warn =~ s/Subroutine sub8 redefined[^\n]+\n//s;
 sub sub9 ($@) { 1 }
 sub sub9 ($)  { 2 }
 
-ok 16, $warn =~ s/Prototype mismatch: \(\$\Q@) vs ($)\E[^\n]+\n//s;
+ok 16, $warn =~ s/$NEWPROTO sub main::sub9 \(\$\Q@) vs ($)\E[^\n]+\n//s;
 ok 17, $warn =~ s/Subroutine sub9 redefined[^\n]+\n//s;
 
 ok 18, $_ eq '';