Upgrade to PathTools-3.17

[p5sagit/p5-mst-13.2.git] / ext / Cwd / t / taint.t

diff --git a/ext/Cwd/t/taint.t b/ext/Cwd/t/taint.t
index 2cd7d19..c92dbe3 100644 (file)
--- a/ext/Cwd/t/taint.t
+++ b/ext/Cwd/t/taint.t
@@ -1,14 +1,21 @@
 #!./perl -Tw
 # Testing Cwd under taint mode.
 
+use strict;
+
 BEGIN {
-    chdir 't' if -d 't';
-    unshift @INC, '../lib';
+    if ($ENV{PERL_CORE}) {
+        chdir 't';
+        @INC = '../lib';
+    }
 }
-
-use strict;
 use Cwd;
-use Test::More tests => 16;
+chdir 't';
+
+use File::Spec;
+use lib File::Spec->catdir('t', 'lib');
+use Test::More tests => 17;
+
 use Scalar::Util qw/tainted/;
 
 my @Functions = qw(getcwd cwd fastcwd fastgetcwd
@@ -20,6 +27,9 @@ foreach my $func (@Functions) {
     no strict 'refs';
     my $cwd;
     eval { $cwd = &{'Cwd::'.$func} };
-    is( $@, '',                "$func() does not explode under taint mode" );
-    ok( tainted($cwd), "its return value is tainted" );
+    is( $@, '',                "$func() should not explode under taint mode" );
+    ok( tainted($cwd), "its return value should be tainted" );
 }
+
+# Previous versions of Cwd tainted $^O
+is !tainted($^O), 1, "\$^O should not be tainted";