allow eval-groups in patterns only if they C<use re 'eval';>

[p5sagit/p5-mst-13.2.git] / t / op / regexp.t

diff --git a/t/op/regexp.t b/t/op/regexp.t
index a4783ba..244ed4a 100755 (executable)
--- a/t/op/regexp.t
+++ b/t/op/regexp.t
@@ -21,23 +21,22 @@
 # Column 5 contains the expected result of double-quote
 # interpolating that string after the match, or start of error message.
 #
-# Columns 1, 2 and 5 are \n-interpolated.
+# \n in the tests are interpolated.
 #
-# The variables $reg_infty, $reg_infty_m and $reg_infty_m in columns 1
-# and 5 are replaced respectively with the configuration value reg_infty,
-# reg_infty-1 and reg_infty+1, or if reg_infty is not defined in the
-# configuration, default values.  No other variables are substituted.
+# If you want to add a regular expression test that can't be expressed
+# in this format, don't add it here: put it in op/pat.t instead.
 
+BEGIN {
+    chdir 't' if -d 't';
+    @INC = '../lib' if -d '../lib';
+}
 
-$iters = shift || 1;           # Poor man performance suite, 10000 is OK.
+use re 'eval';
 
-chdir 't' if -d 't';
-@INC = "../lib";
-eval 'use Config';          #  Defaults assumed if this fails
-$reg_infty = defined $Config{reg_infty} ? $Config{reg_infty} : 32767;
-$reg_infty_m = $reg_infty - 1; $reg_infty_p = $reg_infty + 1;
+$iters = shift || 1;           # Poor man performance suite, 10000 is OK.
 
-open(TESTS,'op/re_tests') || die "Can't open re_tests";
+open(TESTS,'op/re_tests') || open(TESTS,'t/op/re_tests') ||
+       die "Can't open re_tests";
 
 while (<TESTS>) { }
 $numtests = $.;
@@ -48,7 +47,9 @@ $| = 1;
 print "1..$numtests\n# $iters iterations\n";
 TEST:
 while (<TESTS>) {
-    ($pat, $subject, $result, $repl, $expect) = split(/[\t\n]/,$_);
+    chomp;
+    s/\\n/\n/g;
+    ($pat, $subject, $result, $repl, $expect) = split(/\t/,$_);
     $input = join(':',$pat,$subject,$result,$repl,$expect);
     infty_subst(\$pat);
     infty_subst(\$expect);