Change 30097 by [EMAIL PROTECTED] on 2007/02/02 20:40:18
Integrate:
[ 26401]
Missing file from last change
[ 29182]
Fix the failures in warnings tests when PERL_UNICODE is defined
that show up in the smokes under UTF-8 locales. Based on :
Subject: Re: UTF-8 Failures in smoke ($PERL_UNICODE)
From: "H.Merijn Brand" <[EMAIL PROTECTED]>
Date: Wed, 1 Nov 2006 17:03:55 +0100
Message-ID: <[EMAIL PROTECTED]>
[ 29184]
More heuristics to make warnings.t pass under different
combinations of PERL_UNICODE / locale
Affected files ...
... //depot/maint-5.8/perl/MANIFEST#301 integrate
... //depot/maint-5.8/perl/lib/warnings.t#7 integrate
... //depot/maint-5.8/perl/t/lib/common.pl#1 branch
Differences ...
==== //depot/maint-5.8/perl/MANIFEST#301 (text) ====
Index: perl/MANIFEST
--- perl/MANIFEST#300~30096~ 2007-02-02 10:03:45.000000000 -0800
+++ perl/MANIFEST 2007-02-02 12:40:18.000000000 -0800
@@ -2615,6 +2615,7 @@
t/japh/abigail.t Obscure tests
t/lib/1_compile.t See if the various libraries and extensions
compile
t/lib/commonsense.t See if configuration meets basic needs
+t/lib/common.pl Helper for lib/{warnings,feature}.t
t/lib/compmod.pl Helper for 1_compile.t
t/lib/contains_pod.xr Pod-Parser test file
t/lib/cygwin.t Builtin cygwin function tests
==== //depot/maint-5.8/perl/lib/warnings.t#7 (text) ====
Index: perl/lib/warnings.t
--- perl/lib/warnings.t#6~25539~ 2005-09-21 08:02:51.000000000 -0700
+++ perl/lib/warnings.t 2007-02-02 12:40:18.000000000 -0800
@@ -4,201 +4,7 @@
chdir 't' if -d 't';
@INC = '../lib';
$ENV{PERL5LIB} = '../lib';
- require Config; import Config;
- require './test.pl';
}
-use File::Path;
-use File::Spec::Functions;
-
-$| = 1;
-
-my $Is_MacOS = $^O eq 'MacOS';
-my $tmpfile = "tmp0000";
-1 while -e ++$tmpfile;
-END { if ($tmpfile) { 1 while unlink $tmpfile} }
-
-my @prgs = () ;
-my @w_files = () ;
-
-if (@ARGV)
- { print "ARGV = [EMAIL PROTECTED]" ;
- if ($^O eq 'MacOS') {
- @w_files = map { s#^#:lib:warnings:#; $_ } @ARGV
- } else {
- @w_files = map { s#^#./lib/warnings/#; $_ } @ARGV
- }
- }
-else
- { @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;
- while (<F>) {
- $line++;
- last if /^__END__/ ;
- }
-
- {
- local $/ = undef;
- $files++;
- @prgs = (@prgs, $file, split "\n########\n", <F>) ;
- }
- close F ;
-}
-
-undef $/;
-
-plan tests => (scalar(@prgs)-$files);
-
-
-
-for (@prgs){
- unless (/\n/)
- {
- print "# From $_\n";
- next;
- }
- my $switch = "";
- my @temps = () ;
- my @temp_path = () ;
- if (s/^\s*-\w+//){
- $switch = $&;
- }
- 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 $test 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 or die "Cannot close $filename: $!\n";
- }
- 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 {
- 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 or die "Cannot close $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
- $results =~ s/tmp\d+/-/g;
- 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;
- }
- 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;
- my $ok = 1;
- if ( $results =~ s/^SKIPPED\n//) {
- print "$results\n" ;
- }
- elsif ($option_random)
- {
- $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)))) {
- 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;
- }
-
- $TODO = $todo ? $todo_reason : 0;
- ok($ok);
-
- 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";
-
-}
+our $pragma_name = "warnings";
+require "../t/lib/common.pl";
==== //depot/maint-5.8/perl/t/lib/common.pl#1 (text) ====
Index: perl/t/lib/common.pl
--- /dev/null 2007-01-16 11:55:45.526841103 -0800
+++ perl/t/lib/common.pl 2007-02-02 12:40:18.000000000 -0800
@@ -0,0 +1,216 @@
+# This code is used by lib/warnings.t and lib/feature.t
+
+BEGIN {
+ require Config; import Config;
+ require './test.pl';
+}
+
+use File::Path;
+use File::Spec::Functions;
+
+use strict;
+our $pragma_name;
+
+$| = 1;
+
+my $Is_MacOS = $^O eq 'MacOS';
+my $tmpfile = "tmp0000";
+1 while -e ++$tmpfile;
+END { if ($tmpfile) { 1 while unlink $tmpfile} }
+
+my @prgs = () ;
+my @w_files = () ;
+
+if (@ARGV)
+ { print "ARGV = [EMAIL PROTECTED]" ;
+ if ($^O eq 'MacOS') {
+ @w_files = map { s#^#:lib:$pragma_name:#; $_ } @ARGV
+ } else {
+ @w_files = map { s#^#./lib/$pragma_name/#; $_ } @ARGV
+ }
+ }
+else
+ { @w_files = sort glob(catfile(curdir(), "lib", $pragma_name, "*")) }
+
+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;
+ while (<F>) {
+ $line++;
+ last if /^__END__/ ;
+ }
+
+ {
+ local $/ = undef;
+ $files++;
+ @prgs = (@prgs, $file, split "\n########\n", <F>) ;
+ }
+ close F ;
+}
+
+undef $/;
+
+plan tests => (scalar(@prgs)-$files);
+
+my $utf8_ok = exists $ENV{PERL_UNICODE} && (
+ $ENV{PERL_UNICODE} =~ m{[Dio]}
+ || ($ENV{PERL_UNICODE} eq ""
+ && ($ENV{LC_ALL} =~ /\butf-?8\b/i || $ENV{LANG} =~ /\butf-?8\b/i))
+);
+
+for (@prgs){
+ unless (/\n/)
+ {
+ print "# From $_\n";
+ next;
+ }
+ my $switch = "";
+ my @temps = () ;
+ my @temp_path = () ;
+ if (s/^\s*-\w+//){
+ $switch = $&;
+ }
+ my($prog,$expected) = split(/\nEXPECT(?:\n|$)/, $_, 2);
+ $expected =~ s{\b
+ UTF8 \s*
+ \? \s* '(.*?)'
+ : \s* '(.*?)'
+ }{$utf8_ok?$1:$2}gexs;
+
+ 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 $_ 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 or die "Cannot close $filename: $!\n";
+ }
+ 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 {
+ 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 or die "Cannot close $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
+ $results =~ s/tmp\d+/-/g;
+ 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;
+ }
+ 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;
+ my $ok = 1;
+ if ( $results =~ s/^SKIPPED\n//) {
+ print "$results\n" ;
+ }
+ elsif ($option_random)
+ {
+ $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)))) {
+ 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;
+ }
+
+ our $TODO = $todo ? $todo_reason : 0;
+ ok($ok);
+
+ 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";
+
+}
+
+1;
End of Patch.
