Integrate with mainperl.

[p5sagit/p5-mst-13.2.git] / t / pragma / warning.t

diff --git a/t/pragma/warning.t b/t/pragma/warning.t
index c197f35..7914121 100755 (executable)
--- a/t/pragma/warning.t
+++ b/t/pragma/warning.t
@@ -2,20 +2,33 @@
 
 BEGIN {
     chdir 't' if -d 't';
-    @INC = '../lib';
+    unshift @INC, '../lib';
     $ENV{PERL5LIB} = '../lib';
+    require Config; import Config;
 }
 
 $| = 1;
 
+my $Is_VMS     = $^O eq 'VMS';
+my $Is_MSWin32 = $^O eq 'MSWin32';
 my $tmpfile = "tmp0000";
 my $i = 0 ;
 1 while -f ++$tmpfile;
-END { unlink $tmpfile if $tmpfile; }
+END {  if ($tmpfile) { 1 while unlink $tmpfile} }
 
 my @prgs = () ;
+my @w_files = () ;
 
-foreach (sort glob("pragma/warn-*")) {
+if (@ARGV)
+  { print "ARGV = [@ARGV]\n" ; @w_files = map { s#^#./pragma/warn/#; $_ } @ARGV }
+else
+  { @w_files = sort glob("pragma/warn/*") }
+
+foreach (@w_files) {
+
+    next if /\.orig$/ ;
+
+    next if /(~|\.orig)$/;
 
     open F, "<$_" or die "Cannot open $_: $!\n" ;
     while (<F>) {
@@ -39,6 +52,7 @@ for (@prgs){
     my @temps = () ;
     if (s/^\s*-\w+//){
         $switch = $&;
+        $switch =~ s/(-\S*[A-Z]\S*)/"$1"/ if $Is_VMS; # protect uc switches
     }
     my($prog,$expected) = split(/\nEXPECT\n/, $_);
     if ( $prog =~ /--FILE--/) {
@@ -58,19 +72,42 @@ for (@prgs){
        shift @files ;
        $prog = shift @files ;
     }
-    open TEST, "| sh -c './perl $switch' >$tmpfile 2>&1";
-    print TEST $prog, "\n";
+    open TEST, ">$tmpfile";
+    print TEST $prog,"\n";
     close TEST;
+    my $results = $Is_VMS ?
+                  `MCR $^X $switch $tmpfile` :
+                 $Is_MSWin32 ?
+                  `.\\perl -I../lib $switch $tmpfile 2>&1` :
+                  `./perl $switch $tmpfile 2>&1`;
     my $status = $?;
-    my $results = `cat $tmpfile`;
     $results =~ s/\n+$//;
+    # allow expected output to be written as if $prog is on STDIN
+    $results =~ s/tmp\d+/-/g;
+    $results =~ s/\n%[A-Z]+-[SIWEF]-.*$// if $Is_VMS;  # clip off DCL status msg
+# bison says 'parse error' instead of 'syntax error',
+# various yaccs may or may not capitalize 'syntax'.
+    $results =~ s/^(syntax|parse) error/syntax error/mig;
     $expected =~ s/\n+$//;
     my $prefix = ($results =~ s/^PREFIX\n//) ;
+    # any special options? (OPTIONS foo bar zap)
+    my $option_regex = 0;
+    if ($expected =~ s/^OPTIONS? (.+)\n//) {
+       foreach my $option (split(' ', $1)) {
+           if ($option eq 'regex') { # allow regular expressions
+               $option_regex = 1;
+           } else {
+               die "$0: Unknown OPTION '$option'\n";
+           }
+       }
+    }
     if ( $results =~ s/^SKIPPED\n//) {
        print "$results\n" ;
     }
-    elsif (($prefix and $results !~ /^\Q$expected/) or
-          (!$prefix and $results ne $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";