X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Fwarnings.t;h=f23d9e67f80365831d137f955375b1e327c2dcf3;hb=8d0ec8cffad6f81a95e1fb954a5337910142389f;hp=d952906dfe996023ef33347c6a1b5078911d3a73;hpb=99ef548ba710eb2617804c989e4d5fdae1f04f37;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/lib/warnings.t b/lib/warnings.t
index d952906..f23d9e6 100644
--- a/lib/warnings.t
+++ b/lib/warnings.t
@@ -5,32 +5,39 @@ BEGIN {
     @INC = '../lib';
     $ENV{PERL5LIB} = '../lib';
     require Config; import Config;
+    require './test.pl';
 }
 
 use File::Path;
+use File::Spec::Functions;
 
 $| = 1;
 
-my $Is_VMS     = $^O eq 'VMS';
-my $Is_MSWin32 = $^O eq 'MSWin32';
-my $Is_NetWare = $^O eq 'NetWare';
+my $Is_MacOS   = $^O eq 'MacOS';
 my $tmpfile = "tmp0000";
-my $i = 0 ;
-1 while -f ++$tmpfile;
+1 while -e ++$tmpfile;
 END {  if ($tmpfile) { 1 while unlink $tmpfile} }
 
 my @prgs = () ;
 my @w_files = () ;
 
 if (@ARGV)
-  { print "ARGV = [@ARGV]\n" ; @w_files = map { s#^#./lib/warnings/#; $_ } @ARGV }
+  { print "ARGV = [@ARGV]\n" ;
+    if ($^O eq 'MacOS') {
+      @w_files = map { s#^#:lib:warnings:#; $_ } @ARGV
+    } else {
+      @w_files = map { s#^#./lib/warnings/#; $_ } @ARGV
+    }
+  }
 else
-  { @w_files = sort glob("lib/warnings/*") }
+  { @w_files = sort glob(catfile(curdir(), "lib", "warnings", "*")) }
 
 my $files = 0;
 foreach my $file (@w_files) {
 
     next if $file =~ /(~|\.orig|,v)$/;
+    next if $file =~ /perlio$/ && !(find PerlIO::Layer 'perlio');
+    next if -d $file;
 
     open F, "<$file" or die "Cannot open $file: $!\n" ;
     my $line = 0;
@@ -49,7 +56,8 @@ foreach my $file (@w_files) {
 
 undef $/;
 
-print "1..", scalar(@prgs)-$files, "\n";
+plan tests => (scalar(@prgs)-$files);
+
 
 
 for (@prgs){
@@ -63,13 +71,14 @@ for (@prgs){
     my @temp_path = () ;
     if (s/^\s*-\w+//){
         $switch = $&;
-        $switch =~ s/(-\S*[A-Z]\S*)/"$1"/ if $Is_VMS; # protect uc switches
     }
     my($prog,$expected) = split(/\nEXPECT\n/, $_);
+    my ($todo, $todo_reason);
+    $todo = $prog =~ s/^#\s*TODO(.*)\n//m and $todo_reason = $1;
     if ( $prog =~ /--FILE--/) {
         my(@files) = split(/\n--FILE--\s*([^\s\n]*)\s*\n/, $prog) ;
 	shift @files ;
-	die "Internal error test $i didn't split into pairs, got " .
+	die "Internal error test $test didn't split into pairs, got " .
 		scalar(@files) . "[" . join("%%%%", @files) ."]\n"
 	    if @files % 2 ;
 	while (@files > 2) {
@@ -87,6 +96,13 @@ for (@prgs){
 	shift @files ;
 	$prog = shift @files ;
     }
+
+    # fix up some paths
+    if ($^O eq 'MacOS') {
+	$prog =~ s|require "./abc(d)?";|require ":abc$1";|g;
+	$prog =~ s|"\."|":"|g;
+    }
+
     open TEST, ">$tmpfile" or die "Cannot open >$tmpfile: $!";
     print TEST q{
         BEGIN {
@@ -97,15 +113,7 @@ for (@prgs){
     print TEST "\n#line 1\n";  # So the line numbers don't get messed up.
     print TEST $prog,"\n";
     close TEST or die "Cannot close $tmpfile: $!";
-    my $results = $Is_VMS ?
-	              `./perl "-I../lib" $switch $tmpfile` :
-		  $Is_MSWin32 ?
-		      `.\\perl -I../lib $switch $tmpfile` :
-		  $Is_NetWare ?
-		      `perl -I../lib $switch $tmpfile` :
-		  $Is_MacOS ?
-		      `$^X -I::lib $switch -MMac::err=unix $tmpfile` :
-                  `./perl -I../lib $switch $tmpfile`;
+    my $results = runperl( switches => [$switch], stderr => 1, progfile => $tmpfile );
     my $status = $?;
     $results =~ s/\n+$//;
     # allow expected output to be written as if $prog is on STDIN
@@ -122,6 +130,13 @@ for (@prgs){
     $results =~ s/^(syntax|parse) error/syntax error/mig;
     # allow all tests to run when there are leaks
     $results =~ s/Scalars leaked: \d+\n//g;
+
+    # fix up some paths
+    if ($^O eq 'MacOS') {
+	$results =~ s|:abc\.pm\b|abc.pm|g;
+	$results =~ s|:abc(d)?\b|./abc$1|g;
+    }
+
     $expected =~ s/\n+$//;
     my $prefix = ($results =~ s#^PREFIX(\n|$)##) ;
     # any special options? (OPTIONS foo bar zap)
@@ -131,7 +146,7 @@ for (@prgs){
 	foreach my $option (split(' ', $1)) {
 	    if ($option eq 'regex') { # allow regular expressions
 		$option_regex = 1;
-	    } 
+	    }
 	    elsif ($option eq 'random') { # all lines match, but in any order
 		$option_random = 1;
 	    }
@@ -142,23 +157,34 @@ for (@prgs){
     }
     die "$0: can't have OPTION regex and random\n"
         if $option_regex + option_random > 1;
+    my $ok = 1;
     if ( $results =~ s/^SKIPPED\n//) {
 	print "$results\n" ;
     }
     elsif ($option_random)
     {
-        print "not " if !randomMatch($results, $expected);
+        $ok = randomMatch($results, $expected);
     }
     elsif (($prefix  && (( $option_regex && $results !~ /^$expected/) ||
 			 (!$option_regex && $results !~ /^\Q$expected/))) or
 	   (!$prefix && (( $option_regex && $results !~ /^$expected/) ||
 			 (!$option_regex && $results ne $expected)))) {
-        print STDERR "PROG: $switch\n$prog\n";
-        print STDERR "EXPECTED:\n$expected\n";
-        print STDERR "GOT:\n$results\n";
-        print "not ";
+        my $err_line = "PROG: $switch\n$prog\n" .
+                       "EXPECTED:\n$expected\n" .
+                       "GOT:\n$results\n";
+        if ($todo) {
+            $err_line =~ s/^/# /mg;
+            print $err_line;  # Harness can't filter it out from STDERR.
+        }
+        else {
+            print STDERR $err_line;
+        }
+        $ok = 0;
     }
-    print "ok ", ++$i, "\n";
+
+    $TODO = $todo ? $todo_reason : 0;
+    ok($ok);
+
     foreach (@temps)
 	{ unlink $_ if $_ }
     foreach (@temp_path)