Change 32991 by [EMAIL PROTECTED] on 2008/01/17 17:17:05
Integrate:
[ 27345]
Move all the de-tainting logic for runperl into test.pl.
[ 31731]
Subject: [PATCH] Change 31710 causes t/op/taint.t to fail
From: Reini Urban <[EMAIL PROTECTED]>
Date: Fri, 17 Aug 2007 08:56:38 +0200
Message-Id: <[EMAIL PROTECTED]>
[ 31758]
Subject: [PATCH] Revert/fix 31731 - Empty PATH taint test on Cygwin
From: "Jerry D. Hedden" <[EMAIL PROTECTED]>
Date: Tue, 28 Aug 2007 10:43:41 -0400
Message-ID: <[EMAIL PROTECTED]>
[ 32611]
Subject: [PATCH] Must have /bin under Cygwin
From: "Jerry D. Hedden" <[EMAIL PROTECTED]>
Date: Tue, 11 Dec 2007 13:35:55 -0500
Message-ID: <[EMAIL PROTECTED]>
Affected files ...
... //depot/maint-5.8/perl/t/op/taint.t#25 integrate
... //depot/maint-5.8/perl/t/op/utftaint.t#5 integrate
... //depot/maint-5.8/perl/t/test.pl#22 integrate
Differences ...
==== //depot/maint-5.8/perl/t/op/taint.t#25 (xtext) ====
Index: perl/t/op/taint.t
--- perl/t/op/taint.t#24~32379~ 2007-11-17 12:42:55.000000000 -0800
+++ perl/t/op/taint.t 2008-01-17 09:17:05.000000000 -0800
@@ -165,8 +165,7 @@
};
}
}
-
- $ENV{PATH} = '';
+ $ENV{PATH} = ($Is_Cygwin) ? '/usr/bin' : '';
delete @[EMAIL PROTECTED];
$ENV{TERM} = 'dumb';
==== //depot/maint-5.8/perl/t/op/utftaint.t#5 (text) ====
Index: perl/t/op/utftaint.t
--- perl/t/op/utftaint.t#4~30323~ 2007-02-15 09:37:29.000000000 -0800
+++ perl/t/op/utftaint.t 2008-01-17 09:17:05.000000000 -0800
@@ -144,9 +144,6 @@
}
{
- 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");
==== //depot/maint-5.8/perl/t/test.pl#22 (text) ====
Index: perl/t/test.pl
--- perl/t/test.pl#21~32379~ 2007-11-17 12:42:55.000000000 -0800
+++ perl/t/test.pl 2008-01-17 09:17:05.000000000 -0800
@@ -397,6 +397,7 @@
my $is_netware = $^O eq 'NetWare';
my $is_macos = $^O eq 'MacOS';
my $is_vms = $^O eq 'VMS';
+my $is_cygwin = $^O eq 'cygwin';
sub _quote_args {
my ($runperl, $args) = @_;
@@ -530,6 +531,7 @@
join $sep, grep { $_ ne "" and $_ ne "." and -d $_ and
($is_mswin or $is_vms or !(stat && (stat _)[2]&0022)) }
split quotemeta ($sep), $1;
+ $ENV{PATH} .= "$sep/bin" if $is_cygwin; # Must have /bin under Cygwin
$runperl =~ /(.*)/s;
$runperl = $1;
End of Patch.
