X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fop%2Fregexp.t;h=3cebee993a8b4f0f56ca247d3a383eeefd8df89d;hb=397cf4b72b64bab2d81c27006b39549ca667b5a8;hp=4a4d42fd98d8c4d445b66ad99fd27964885ed177;hpb=7f01dc7a4234ca6b7fa5abbc363f1bad0c7b11b9;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/t/op/regexp.t b/t/op/regexp.t
index 4a4d42f..3cebee9 100755
--- a/t/op/regexp.t
+++ b/t/op/regexp.t
@@ -38,7 +38,7 @@ BEGIN {
 
 $iters = shift || 1;		# Poor man performance suite, 10000 is OK.
 
-open(TESTS,'op/re_tests') || open(TESTS,'t/op/re_tests') ||
+open(TESTS,'op/re_tests') || open(TESTS,'t/op/re_tests') || open(TESTS,':op:re_tests') ||
 	die "Can't open re_tests";
 
 while (<TESTS>) { }
@@ -69,9 +69,7 @@ while (<TESTS>) {
     $expect =~ s/\\n/\n/g;
     $expect = $repl = '-' if $skip_amp and $input =~ /\$[&\`\']/;
     $skip = ($skip_amp ? ($result =~ s/B//i) : ($result =~ s/B//));
-    # Certain tests don't work with utf8 (the re_test should be in UTF8)
-    $skip = 1, $reason = 'utf8'
-      if ($^H &= ~0x00000008) && $pat =~ /\[:\^(alnum|print|word|ascii|xdigit):\]/;
+    $reason = 'skipping $&' if $reason eq  '' && $skip_amp;
     $result =~ s/B//i unless $skip;
     for $study ('', 'study \$subject') {
  	$c = $iters;