X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Fwarnings.t;h=8e57a6db5993798f0940a167140b223af2d18d6e;hb=08411240a1e5278b0232e1455d984110b1c5343b;hp=addcea2bd3c945d0307d4772d6c6f4c8b9607232;hpb=601f2d16e592dad4a4b6a344fbe935aa06230d2e;p=p5sagit%2Fp5-mst-13.2.git diff --git a/lib/warnings.t b/lib/warnings.t index addcea2..8e57a6d 100644 --- a/lib/warnings.t +++ b/lib/warnings.t @@ -1,4 +1,4 @@ -#!./perl +#!./perl BEGIN { chdir 't' if -d 't'; @@ -7,39 +7,50 @@ BEGIN { require Config; import Config; } +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'); open F, "<$file" or die "Cannot open $file: $!\n" ; my $line = 0; while () { - $line++; + $line++; last if /^__END__/ ; } { local $/ = undef; - $files++; + $files++; @prgs = (@prgs, $file, split "\n########\n", ) ; } close F ; @@ -48,16 +59,17 @@ foreach my $file (@w_files) { undef $/; print "1..", scalar(@prgs)-$files, "\n"; - - + + for (@prgs){ unless (/\n/) { - print "# From $_\n"; - next; + print "# From $_\n"; + next; } my $switch = ""; my @temps = () ; + my @temp_path = () ; if (s/^\s*-\w+//){ $switch = $&; $switch =~ s/(-\S*[A-Z]\S*)/"$1"/ if $Is_VMS; # protect uc switches @@ -66,56 +78,100 @@ for (@prgs){ 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 $i didn't split into pairs, got " . scalar(@files) . "[" . join("%%%%", @files) ."]\n" if @files % 2 ; while (@files > 2) { my $filename = shift @files ; my $code = shift @files ; push @temps, $filename ; + if ($filename =~ m#(.*)/#) { + mkpath($1); + push(@temp_path, $1); + } open F, ">$filename" or die "Cannot open $filename: $!\n" ; print F $code ; - close F ; + close F or die "Cannot close $filename: $!\n"; } shift @files ; $prog = shift @files ; } - open TEST, ">$tmpfile"; + + # 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 { + open(STDERR, ">&STDOUT") + or die "Can't dup STDOUT->STDERR: $!;"; + } + }; + print TEST "\n#line 1\n"; # So the line numbers don't get messed up. print TEST $prog,"\n"; - close TEST; + close TEST or die "Cannot close $tmpfile: $!"; my $results = $Is_VMS ? - `./perl "-I../lib" $switch $tmpfile 2>&1` : + `./perl "-I../lib" $switch $tmpfile` : $Is_MSWin32 ? - `.\\perl -I../lib $switch $tmpfile 2>&1` : + `.\\perl -I../lib $switch $tmpfile` : $Is_NetWare ? - `perl -I../lib $switch $tmpfile 2>&1` : - `./perl -I../lib $switch $tmpfile 2>&1`; + `perl -I../lib $switch $tmpfile` : + $Is_MacOS ? + `$^X -I::lib $switch -MMac::err=unix $tmpfile` : + `./perl -I../lib $switch $tmpfile`; my $status = $?; $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 + if ($^O eq 'VMS') { + # some tests will trigger VMS messages that won't be expected + $results =~ s/\n?%[A-Z]+-[SIWEF]-[A-Z]+,.*//; + + # pipes double these sometimes + $results =~ s/\n\n/\n/g; + } # bison says 'parse error' instead of 'syntax error', # various yaccs may or may not capitalize 'syntax'. $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) my $option_regex = 0; + my $option_random = 0; if ($expected =~ s/^OPTIONS? (.+)\n//) { foreach my $option (split(' ', $1)) { if ($option eq 'regex') { # allow regular expressions $option_regex = 1; - } else { + } + elsif ($option eq 'random') { # all lines match, but in any order + $option_random = 1; + } + else { die "$0: Unknown OPTION '$option'\n"; } } } + die "$0: can't have OPTION regex and random\n" + if $option_regex + option_random > 1; if ( $results =~ s/^SKIPPED\n//) { print "$results\n" ; } + elsif ($option_random) + { + print "not " if !randomMatch($results, $expected); + } elsif (($prefix && (( $option_regex && $results !~ /^$expected/) || (!$option_regex && $results !~ /^\Q$expected/))) or (!$prefix && (( $option_regex && $results !~ /^$expected/) || @@ -126,6 +182,20 @@ for (@prgs){ print "not "; } print "ok ", ++$i, "\n"; - foreach (@temps) - { unlink $_ if $_ } + foreach (@temps) + { unlink $_ if $_ } + foreach (@temp_path) + { rmtree $_ if -d $_ } +} + +sub randomMatch +{ + my $got = shift ; + my $expected = shift; + + my @got = sort split "\n", $got ; + my @expected = sort split "\n", $expected ; + + return "@got" eq "@expected"; + }