Fixes for the test suite on OS/2

[p5sagit/p5-mst-13.2.git] / lib / ExtUtils / testlib.pm

diff --git a/lib/ExtUtils/testlib.pm b/lib/ExtUtils/testlib.pm
index 6ea13ca..fffaed1 100644 (file)
--- a/lib/ExtUtils/testlib.pm
+++ b/lib/ExtUtils/testlib.pm
@@ -1,9 +1,19 @@
 package ExtUtils::testlib;
-$VERSION = 1.12_01;
+$VERSION = 1.16;
 
-# So the tests can chdir around and not break @INC.
+use Cwd;
 use File::Spec;
-use lib map File::Spec->rel2abs($_), qw(blib/arch blib/lib);
+
+# So the tests can chdir around and not break @INC.
+# We use getcwd() because otherwise rel2abs will blow up under taint
+# mode pre-5.8.  We detaint is so @INC won't be tainted.  This is
+# no worse, and probably better, than just shoving an untainted, 
+# relative "blib/lib" onto @INC.
+my $cwd;
+BEGIN {
+    ($cwd) = getcwd() =~ /(.*)/;
+}
+use lib map File::Spec->rel2abs($_, $cwd), qw(blib/arch blib/lib);
 1;
 __END__