undo a Scalar-List-Utils customisation

.. in preparation for installing new release

Revert "Cherry-pick Scalar-List-Utils tainted.t fix from upstream"

This reverts commit a76614debec3c698069bcf0fa012318ed15461cc.

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 9842741..8f79fd4 100755 (executable)
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -968,7 +968,6 @@ use File::Glob qw(:case);
             'lib/Sub/Util.pm',     # CPAN RT 118470
             't/lln.t',             # CPAN RT 118470
             't/uniq.t',            # CPAN RT 118470
-            't/tainted.t',         # CPAN RT 119169
         ],
     },
 

diff --git a/cpan/Scalar-List-Utils/t/tainted.t b/cpan/Scalar-List-Utils/t/tainted.t
index fb83c86..9e0df5e 100644 (file)
--- a/cpan/Scalar-List-Utils/t/tainted.t
+++ b/cpan/Scalar-List-Utils/t/tainted.t
@@ -13,10 +13,15 @@ my $var = 2;
 
 ok( !tainted($var), 'known variable');
 
-ok( tainted($^X),      'interpreter variable');
+my $key = (grep { !/^PERL/ } keys %ENV)[0];
 
-$var = $^X;
-ok( tainted($var),     'copy of interpreter variable');
+SKIP: { # Skip these to get blead to pass, but the skip expires soon
+skip 'is randomly failing', 2 unless $] gt 5.025009;
+ok( tainted($ENV{$key}),       'environment variable');
+
+$var = $ENV{$key};
+ok( tainted($var),     'copy of environment variable');
+}
 
 {
     package Tainted;

diff --git a/t/porting/customized.dat b/t/porting/customized.dat
index 3be683b..9e76a17 100644 (file)
--- a/t/porting/customized.dat
+++ b/t/porting/customized.dat
@@ -19,7 +19,6 @@ Scalar-List-Utils cpan/Scalar-List-Utils/lib/List/Util/XS.pm 2d09b84a5575e678346
 Scalar-List-Utils cpan/Scalar-List-Utils/lib/Scalar/Util.pm 98af8fe390d9c9fa11a1fafebbc68ea663cdce2c
 Scalar-List-Utils cpan/Scalar-List-Utils/lib/Sub/Util.pm 188cf0dd95cd7ba60fd6a366f440811fb52c2c79
 Scalar-List-Utils cpan/Scalar-List-Utils/t/lln.t b7148c7f1cd9c70fd21d8153542b6d3de2b655ad
-Scalar-List-Utils cpan/Scalar-List-Utils/t/tainted.t 9c52e04687ec8a7d23a1c38a762723858305b1fe
 Scalar-List-Utils cpan/Scalar-List-Utils/t/uniq.t 5de01094d2bca9cf8b2bbbca920122f7396bf11e
 Socket cpan/Socket/Socket.pm 98e38176d745c38282907f391c077298f5a3d0ba
 Socket cpan/Socket/Socket.xs edd4fed212785f11c5c2095a75941dad27d586d9