SYN SYN

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

diff --git a/t/op/regexp.t b/t/op/regexp.t
index 66b2d1c..23ae576 100755 (executable)
--- a/t/op/regexp.t
+++ b/t/op/regexp.t
@@ -33,7 +33,7 @@ $ENV{PERL_DESTRUCT_LEVEL} = 0 unless $ENV{PERL_DESTRUCT_LEVEL} > 3;
 
 BEGIN {
     chdir 't' if -d 't';
-    unshift @INC, '../lib' if -d '../lib';
+    @INC = '../lib';
 }
 
 $iters = shift || 1;           # Poor man performance suite, 10000 is OK.
@@ -47,6 +47,8 @@ seek(TESTS,0,0);
 $. = 0;
 
 $bang = sprintf "\\%03o", ord "!"; # \41 would not be portable.
+$ffff  = chr(0xff) x 2;
+$nulnul = "\0" x 2;
 
 $| = 1;
 print "1..$numtests\n# $iters iterations\n";
@@ -59,12 +61,16 @@ while (<TESTS>) {
     infty_subst(\$pat);
     infty_subst(\$expect);
     $pat = "'$pat'" unless $pat =~ /^[:']/;
-    $pat =~ s/\\n/\n/g;
     $pat =~ s/(\$\{\w+\})/$1/eeg;
+    $pat =~ s/\\n/\n/g;
+    $subject =~ s/(\$\{\w+\})/$1/eeg;
     $subject =~ s/\\n/\n/g;
+    $expect =~ s/(\$\{\w+\})/$1/eeg;
     $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 if ($^H &= ~0x00000008) && $pat =~ /\[:\^(alnum|print|word):\]/;
     $result =~ s/B//i unless $skip;
     for $study ('', 'study \$subject') {
        $c = $iters;
@@ -75,7 +81,7 @@ while (<TESTS>) {
            last;  # no need to study a syntax error
        }
        elsif ( $skip ) {
-           print "ok $. # Skipped: not fixed yet\n"; next TEST;
+           print "ok $. # skipped\n"; next TEST;
        }
        elsif ($@) {
            print "not ok $. $input => error `$err'\n"; next TEST;