threads::shared 1.24 (phase 2)

[p5sagit/p5-mst-13.2.git] / lib / strict.t

diff --git a/lib/strict.t b/lib/strict.t
index a95b563..16dcbec 100644 (file)
--- a/lib/strict.t
+++ b/lib/strict.t
@@ -36,7 +36,7 @@ foreach (sort glob($^O eq 'MacOS' ? ":lib:strict:*" : "lib/strict/*")) {
 
 undef $/;
 
-print "1..", @prgs + 4, "\n";
+print "1.." . (@prgs + 4) . "\n";
  
  
 for (@prgs){
@@ -74,7 +74,7 @@ for (@prgs){
                      `perl -I../lib $switch $tmpfile 2>&1` :
                   $^O eq 'MacOS' ?
                      `$^X -I::lib -MMac::err=unix $switch $tmpfile` :
-                  `./perl $switch $tmpfile 2>&1`;
+                  `$^X $switch $tmpfile 2>&1`;
     my $status = $?;
     $results =~ s/\n+$//;
     # allow expected output to be written as if $prog is on STDIN
@@ -84,33 +84,36 @@ for (@prgs){
     $expected =~ s|(\./)?abc\.pm|:abc.pm|g if $^O eq 'MacOS';
     $expected =~ s|./abc|:abc|g if $^O eq 'MacOS';
     my $prefix = ($results =~ s/^PREFIX\n//) ;
+    my $TODO = $prog =~ m/^#\s*TODO:/;
     if ( $results =~ s/^SKIPPED\n//) {
        print "$results\n" ;
     }
     elsif (($prefix and $results !~ /^\Q$expected/) or
           (!$prefix and $results ne $expected)){
-        print STDERR "PROG: $switch\n$prog\n";
-        print STDERR "EXPECTED:\n$expected\n";
-        print STDERR "GOT:\n$results\n";
+        if (! $TODO) {
+            print STDERR "PROG: $switch\n$prog\n";
+            print STDERR "EXPECTED:\n$expected\n";
+            print STDERR "GOT:\n$results\n";
+        }
         print "not ";
     }
-    print "ok ", ++$i, "\n";
+    print "ok " . ++$i . ($TODO ? " # TODO" : "") . "\n";
     foreach (@temps) 
        { unlink $_ if $_ } 
 }
 
 eval qq(use strict 'garbage');
-print +($@ =~ /^Don't know how to 'use strict qw\(garbage\)/)
+print +($@ =~ /^Unknown 'strict' tag\(s\) 'garbage'/)
        ? "ok ".++$i."\n" : "not ok ".++$i."\t# $@";
 
 eval qq(no strict 'garbage');
-print +($@ =~ /^Don't know how to 'no strict qw\(garbage\)/)
+print +($@ =~ /^Unknown 'strict' tag\(s\) 'garbage'/)
        ? "ok ".++$i."\n" : "not ok ".++$i."\t# $@";
 
 eval qq(use strict qw(foo bar));
-print +($@ =~ /^Don't know how to 'use strict qw\(foo bar\)/)
+print +($@ =~ /^Unknown 'strict' tag\(s\) 'foo bar'/)
        ? "ok ".++$i."\n" : "not ok ".++$i."\t# $@";
 
 eval qq(no strict qw(foo bar));
-print +($@ =~ /^Don't know how to 'no strict qw\(foo bar\)/)
+print +($@ =~ /^Unknown 'strict' tag\(s\) 'foo bar'/)
        ? "ok ".++$i."\n" : "not ok ".++$i."\t# $@";