Change 30323 by [EMAIL PROTECTED] on 2007/02/15 17:37:29
Integrate:
[ 27236]
utftaint.t won't be able to run tests with -T if you have
Insecure directory in $ENV{PATH}
so skip them. (Probably this means you have . in your PATH)
[ 27248]
Subject: [PATCH] Trouble with $ENV{CDPATH} after change #27236
From: Dominic Dunlop <[EMAIL PROTECTED]>
Date: Feb 20, 2006 2:49 PM
Message-Id: <[EMAIL PROTECTED]>
[ 27341]
Fix op/utftaint.t on Win32 following change #27248
(Don't remove PATH completely because it'll break on Unix if you
have . in the PATH)
[ 29723]
do $file; won't propagate errors from die, as do is an implicit eval.
So need to propagate errors with [EMAIL PROTECTED]
[ 29734]
Subject: Re: Change 29723 breaks t/op/inccode-tie.t on Win32
From: Nicholas Clark <[EMAIL PROTECTED]>
Date: Tue, 9 Jan 2007 12:31:17 +0000
Message-ID: <[EMAIL PROTECTED]>
Affected files ...
... //depot/maint-5.8/perl/ext/DynaLoader/hints/gnukfreebsd.pl#2 integrate
... //depot/maint-5.8/perl/ext/DynaLoader/hints/gnuknetbsd.pl#2 integrate
... //depot/maint-5.8/perl/ext/NDBM_File/hints/gnukfreebsd.pl#2 integrate
... //depot/maint-5.8/perl/ext/NDBM_File/hints/gnuknetbsd.pl#2 integrate
... //depot/maint-5.8/perl/ext/ODBM_File/hints/gnukfreebsd.pl#2 integrate
... //depot/maint-5.8/perl/ext/ODBM_File/hints/gnuknetbsd.pl#2 integrate
... //depot/maint-5.8/perl/ext/POSIX/hints/gnukfreebsd.pl#2 integrate
... //depot/maint-5.8/perl/ext/POSIX/hints/gnuknetbsd.pl#2 integrate
... //depot/maint-5.8/perl/ext/Storable/hints/gnukfreebsd.pl#2 integrate
... //depot/maint-5.8/perl/ext/Storable/hints/gnuknetbsd.pl#2 integrate
... //depot/maint-5.8/perl/lib/perl5db.pl#29 integrate
... //depot/maint-5.8/perl/lib/utf8_heavy.pl#9 integrate
... //depot/maint-5.8/perl/t/comp/require.t#13 integrate
... //depot/maint-5.8/perl/t/op/do.t#4 integrate
... //depot/maint-5.8/perl/t/op/inccode-tie.t#2 integrate
... //depot/maint-5.8/perl/t/op/regexp_noamp.t#2 integrate
... //depot/maint-5.8/perl/t/op/regexp_qr.t#2 integrate
... //depot/maint-5.8/perl/t/op/regexp_qr_embed.t#2 integrate
... //depot/maint-5.8/perl/t/op/threads.t#7 integrate
... //depot/maint-5.8/perl/t/op/utftaint.t#4 integrate
... //depot/maint-5.8/perl/t/uni/case.pl#4 integrate
... //depot/maint-5.8/perl/win32/ce-helpers/makedist.pl#2 integrate
Differences ...
==== //depot/maint-5.8/perl/ext/DynaLoader/hints/gnukfreebsd.pl#2 (text) ====
Index: perl/ext/DynaLoader/hints/gnukfreebsd.pl
--- perl/ext/DynaLoader/hints/gnukfreebsd.pl#1~23936~ 2005-02-05
07:07:43.000000000 -0800
+++ perl/ext/DynaLoader/hints/gnukfreebsd.pl 2007-02-15 09:37:29.000000000
-0800
@@ -1 +1 @@
-do './hints/linux.pl';
+do './hints/linux.pl' or die $@;
==== //depot/maint-5.8/perl/ext/DynaLoader/hints/gnuknetbsd.pl#2 (text) ====
Index: perl/ext/DynaLoader/hints/gnuknetbsd.pl
--- perl/ext/DynaLoader/hints/gnuknetbsd.pl#1~23936~ 2005-02-05
07:07:43.000000000 -0800
+++ perl/ext/DynaLoader/hints/gnuknetbsd.pl 2007-02-15 09:37:29.000000000
-0800
@@ -1 +1 @@
-do './hints/linux.pl';
+do './hints/linux.pl' or die $@;
==== //depot/maint-5.8/perl/ext/NDBM_File/hints/gnukfreebsd.pl#2 (text) ====
Index: perl/ext/NDBM_File/hints/gnukfreebsd.pl
--- perl/ext/NDBM_File/hints/gnukfreebsd.pl#1~23936~ 2005-02-05
07:07:43.000000000 -0800
+++ perl/ext/NDBM_File/hints/gnukfreebsd.pl 2007-02-15 09:37:29.000000000
-0800
@@ -1 +1 @@
-do './hints/linux.pl';
+do './hints/linux.pl' or die $@;
==== //depot/maint-5.8/perl/ext/NDBM_File/hints/gnuknetbsd.pl#2 (text) ====
Index: perl/ext/NDBM_File/hints/gnuknetbsd.pl
--- perl/ext/NDBM_File/hints/gnuknetbsd.pl#1~23936~ 2005-02-05
07:07:43.000000000 -0800
+++ perl/ext/NDBM_File/hints/gnuknetbsd.pl 2007-02-15 09:37:29.000000000
-0800
@@ -1 +1 @@
-do './hints/linux.pl';
+do './hints/linux.pl' or die $@;
==== //depot/maint-5.8/perl/ext/ODBM_File/hints/gnukfreebsd.pl#2 (text) ====
Index: perl/ext/ODBM_File/hints/gnukfreebsd.pl
--- perl/ext/ODBM_File/hints/gnukfreebsd.pl#1~23936~ 2005-02-05
07:07:43.000000000 -0800
+++ perl/ext/ODBM_File/hints/gnukfreebsd.pl 2007-02-15 09:37:29.000000000
-0800
@@ -1 +1 @@
-do './hints/linux.pl';
+do './hints/linux.pl' or die $@;
==== //depot/maint-5.8/perl/ext/ODBM_File/hints/gnuknetbsd.pl#2 (text) ====
Index: perl/ext/ODBM_File/hints/gnuknetbsd.pl
--- perl/ext/ODBM_File/hints/gnuknetbsd.pl#1~23936~ 2005-02-05
07:07:43.000000000 -0800
+++ perl/ext/ODBM_File/hints/gnuknetbsd.pl 2007-02-15 09:37:29.000000000
-0800
@@ -1 +1 @@
-do './hints/linux.pl';
+do './hints/linux.pl' or die $@;
==== //depot/maint-5.8/perl/ext/POSIX/hints/gnukfreebsd.pl#2 (text) ====
Index: perl/ext/POSIX/hints/gnukfreebsd.pl
--- perl/ext/POSIX/hints/gnukfreebsd.pl#1~23936~ 2005-02-05
07:07:43.000000000 -0800
+++ perl/ext/POSIX/hints/gnukfreebsd.pl 2007-02-15 09:37:29.000000000 -0800
@@ -1 +1 @@
-do './hints/linux.pl';
+do './hints/linux.pl' or die $@;
==== //depot/maint-5.8/perl/ext/POSIX/hints/gnuknetbsd.pl#2 (text) ====
Index: perl/ext/POSIX/hints/gnuknetbsd.pl
--- perl/ext/POSIX/hints/gnuknetbsd.pl#1~23936~ 2005-02-05 07:07:43.000000000
-0800
+++ perl/ext/POSIX/hints/gnuknetbsd.pl 2007-02-15 09:37:29.000000000 -0800
@@ -1 +1 @@
-do './hints/linux.pl';
+do './hints/linux.pl' or die $@;
==== //depot/maint-5.8/perl/ext/Storable/hints/gnukfreebsd.pl#2 (text) ====
Index: perl/ext/Storable/hints/gnukfreebsd.pl
--- perl/ext/Storable/hints/gnukfreebsd.pl#1~23936~ 2005-02-05
07:07:43.000000000 -0800
+++ perl/ext/Storable/hints/gnukfreebsd.pl 2007-02-15 09:37:29.000000000
-0800
@@ -1 +1 @@
-do './hints/linux.pl';
+do './hints/linux.pl' or die $@;
==== //depot/maint-5.8/perl/ext/Storable/hints/gnuknetbsd.pl#2 (text) ====
Index: perl/ext/Storable/hints/gnuknetbsd.pl
--- perl/ext/Storable/hints/gnuknetbsd.pl#1~23936~ 2005-02-05
07:07:43.000000000 -0800
+++ perl/ext/Storable/hints/gnuknetbsd.pl 2007-02-15 09:37:29.000000000
-0800
@@ -1 +1 @@
-do './hints/linux.pl';
+do './hints/linux.pl' or die $@;
==== //depot/maint-5.8/perl/lib/perl5db.pl#29 (text) ====
Index: perl/lib/perl5db.pl
--- perl/lib/perl5db.pl#28~30271~ 2007-02-13 15:07:06.000000000 -0800
+++ perl/lib/perl5db.pl 2007-02-15 09:37:29.000000000 -0800
@@ -2407,7 +2407,7 @@
@vars = split( ' ', $2 );
# If main::dumpvar isn't here, get it.
- do 'dumpvar.pl' unless defined &main::dumpvar;
+ do 'dumpvar.pl' || die $@ unless defined &main::dumpvar;
if ( defined &main::dumpvar ) {
# We got it. Turn off subroutine entry/exit messages
@@ -2606,7 +2606,7 @@
and next CMD;
# Load up dumpvar if we don't have it. If we can, that is.
- do 'dumpvar.pl' unless defined &main::dumpvar;
+ do 'dumpvar.pl' || die $@ unless defined &main::dumpvar;
defined &main::dumpvar
or print $OUT "dumpvar.pl not available.\n"
and next CMD;
@@ -5584,7 +5584,7 @@
# Load dumpvar.pl unless we've already got the sub we need from it.
unless ( defined &main::dumpValue ) {
- do 'dumpvar.pl';
+ do 'dumpvar.pl' or die $@;
}
# If the load succeeded (or we already had dumpvalue()), go ahead
==== //depot/maint-5.8/perl/lib/utf8_heavy.pl#9 (text) ====
Index: perl/lib/utf8_heavy.pl
--- perl/lib/utf8_heavy.pl#8~29770~ 2007-01-12 04:22:53.000000000 -0800
+++ perl/lib/utf8_heavy.pl 2007-02-15 09:37:29.000000000 -0800
@@ -194,7 +194,7 @@
return $Cache{$class, $file};
}
- $list = do $file;
+ $list = do $file; die $@ if $@;
}
$ListSorted = 1; ## we know that these lists are sorted
==== //depot/maint-5.8/perl/t/comp/require.t#13 (xtext) ====
Index: perl/t/comp/require.t
--- perl/t/comp/require.t#12~29908~ 2007-01-21 13:58:40.000000000 -0800
+++ perl/t/comp/require.t 2007-02-15 09:37:29.000000000 -0800
@@ -125,9 +125,9 @@
write_file("bleah.do", <<EOT);
\$x = "not ok $i\\n";
EOT
-do "bleah.do";
+do "bleah.do" or die $@;
dofile();
-sub dofile { do "bleah.do"; };
+sub dofile { do "bleah.do" or die $@; };
print $x;
# Test that scalar context is forced for require
==== //depot/maint-5.8/perl/t/op/do.t#4 (xtext) ====
Index: perl/t/op/do.t
--- perl/t/op/do.t#3~29733~ 2007-01-09 03:12:58.000000000 -0800
+++ perl/t/op/do.t 2007-02-15 09:37:29.000000000 -0800
@@ -62,21 +62,21 @@
close DO or die "Could not close: $!";
}
-my $a = do "$$.16";
+my $a = do "$$.16"; die $@ if $@;
if (open(DO, ">$$.17")) {
print DO "ok(1, 'do in list context') if defined wantarray &&
wantarray\n";
close DO or die "Could not close: $!";
}
-my @a = do "$$.17";
+my @a = do "$$.17"; die $@ if $@;
if (open(DO, ">$$.18")) {
print DO "ok(1, 'do in void context') if not defined wantarray\n";
close DO or die "Could not close: $!";
}
-do "$$.18";
+do "$$.18"; die $@ if $@;
# bug ID 20010920.007
eval qq{ do qq(a file that does not exist); };
==== //depot/maint-5.8/perl/t/op/inccode-tie.t#2 (text) ====
Index: perl/t/op/inccode-tie.t
--- perl/t/op/inccode-tie.t#1~30068~ 2007-01-29 12:23:46.000000000 -0800
+++ perl/t/op/inccode-tie.t 2007-02-15 09:37:29.000000000 -0800
@@ -8,7 +8,7 @@
@INC = @orig_INC;
for my $file ('./op/inccode.t', './t/op/inccode.t', ':op:inccode.t') {
if (-r $file) {
- do $file;
+ do $file; die $@ if $@;
exit;
}
}
==== //depot/maint-5.8/perl/t/op/regexp_noamp.t#2 (xtext) ====
Index: perl/t/op/regexp_noamp.t
--- perl/t/op/regexp_noamp.t#1~17645~ 2002-07-19 12:29:57.000000000 -0700
+++ perl/t/op/regexp_noamp.t 2007-02-15 09:37:29.000000000 -0800
@@ -3,7 +3,7 @@
$skip_amp = 1;
for $file ('./op/regexp.t', './t/op/regexp.t', ':op:regexp.t') {
if (-r $file) {
- do $file;
+ do $file or die $@;
exit;
}
}
==== //depot/maint-5.8/perl/t/op/regexp_qr.t#2 (text) ====
Index: perl/t/op/regexp_qr.t
--- perl/t/op/regexp_qr.t#1~27604~ 2006-03-25 07:15:28.000000000 -0800
+++ perl/t/op/regexp_qr.t 2007-02-15 09:37:29.000000000 -0800
@@ -3,7 +3,7 @@
$qr = 1;
for $file ('./op/regexp.t', './t/op/regexp.t', ':op:regexp.t') {
if (-r $file) {
- do $file;
+ do $file or die $@;
exit;
}
}
==== //depot/maint-5.8/perl/t/op/regexp_qr_embed.t#2 (text) ====
Index: perl/t/op/regexp_qr_embed.t
--- perl/t/op/regexp_qr_embed.t#1~28147~ 2006-05-09 15:15:36.000000000
-0700
+++ perl/t/op/regexp_qr_embed.t 2007-02-15 09:37:29.000000000 -0800
@@ -4,7 +4,7 @@
$qr_embed = 1;
for $file ('./op/regexp.t', './t/op/regexp.t', ':op:regexp.t') {
if (-r $file) {
- do $file;
+ do $file or die $@;
exit;
}
}
==== //depot/maint-5.8/perl/t/op/threads.t#7 (text) ====
Index: perl/t/op/threads.t
--- perl/t/op/threads.t#6~30096~ 2007-02-02 10:03:45.000000000 -0800
+++ perl/t/op/threads.t 2007-02-15 09:37:29.000000000 -0800
@@ -75,5 +75,5 @@
# http://www.nntp.perl.org/group/perl.perl5.porters/63123
fresh_perl_is(<<'EOI', 'ok', { }, 'Ensure PL_linestr can be cloned');
use threads;
-print do 'op/threads_create.pl';
+print do 'op/threads_create.pl' || die $@;
EOI
==== //depot/maint-5.8/perl/t/op/utftaint.t#4 (text) ====
Index: perl/t/op/utftaint.t
--- perl/t/op/utftaint.t#3~28182~ 2006-05-12 11:29:48.000000000 -0700
+++ perl/t/op/utftaint.t 2007-02-15 09:37:29.000000000 -0800
@@ -143,10 +143,15 @@
is(tainted($taint), tainted($arg), "tainted: $encode, downgrade down");
}
-fresh_perl_is('$a = substr $^X, 0, 0; /\x{100}/i; /$a\x{100}/i || print q,ok,',
- 'ok', {switches => ["-T", "-l"]},
- "matching a regexp is taint agnostic");
+{
+ my @keys = qw(CDPATH IFS ENV BASH_ENV);
+ push @keys, qw(PATH) unless $^O eq 'MSWin32';
+ local @[EMAIL PROTECTED] = (undef) x scalar(@keys);
+ fresh_perl_is('$a = substr $^X, 0, 0; /\x{100}/i; /$a\x{100}/i || print
q,ok,',
+ 'ok', {switches => ["-T", "-l"]},
+ "matching a regexp is taint agnostic");
-fresh_perl_is('$a = substr $^X, 0, 0; /$a\x{100}/i || print q,ok,',
- 'ok', {switches => ["-T", "-l"]},
- "therefore swash_init should be taint agnostic");
+ fresh_perl_is('$a = substr $^X, 0, 0; /$a\x{100}/i || print q,ok,',
+ 'ok', {switches => ["-T", "-l"]},
+ "therefore swash_init should be taint agnostic");
+}
==== //depot/maint-5.8/perl/t/uni/case.pl#4 (text) ====
Index: perl/t/uni/case.pl
--- perl/t/uni/case.pl#3~26660~ 2006-01-05 08:57:55.000000000 -0800
+++ perl/t/uni/case.pl 2007-02-15 09:37:29.000000000 -0800
@@ -23,7 +23,7 @@
my $file = File::Spec->catfile(File::Spec->catdir(File::Spec->updir,
"lib", "unicore", "To"),
"$base.pl");
- my $simple = do $file;
+ my $simple = do $file or die $@;
my %simple;
for my $i (split(/\n/, $simple)) {
my ($k, $v) = split(' ', $i);
==== //depot/maint-5.8/perl/win32/ce-helpers/makedist.pl#2 (text) ====
Index: perl/win32/ce-helpers/makedist.pl
--- perl/win32/ce-helpers/makedist.pl#1~30286~ 2007-02-14 06:15:49.000000000
-0800
+++ perl/win32/ce-helpers/makedist.pl 2007-02-15 09:37:29.000000000 -0800
@@ -237,7 +237,7 @@
my $bs = $file;
$bs =~ s/(\.\w+)?(;\d*)?$/\.bs/;
if (-s $bs) { # only read file if it's not empty
- eval { do $bs; };
+ do $bs;
warn "$bs: [EMAIL PROTECTED]" if $@;
}
End of Patch.
