ExtUtils::MakeMaker 5.94_02 -> 5.95_01

Message-ID: <20020518185350.GB2878@ool-18b93024.dyn.optonline.net>

p4raw-id: //depot/perl@16681

diff --git a/lib/ExtUtils/Changes b/lib/ExtUtils/Changes
index bd34720..12262d1 100644 (file)
--- a/lib/ExtUtils/Changes
+++ b/lib/ExtUtils/Changes
@@ -1,3 +1,7 @@
+5.95_01 Sat May 18 14:40:12 EDT 2002
+    - Fixed ExtUtils::testlib so it has a reasonable chance of working
+      under taint mode.
+
 5.94_02 Fri May 17 17:16:04 EDT 2002
     - Fixing Manifest.t test for relative @INC when core testing.
 

diff --git a/lib/ExtUtils/MakeMaker.pm b/lib/ExtUtils/MakeMaker.pm
index cf650c4..38871a4 100644 (file)
--- a/lib/ExtUtils/MakeMaker.pm
+++ b/lib/ExtUtils/MakeMaker.pm
@@ -2,10 +2,10 @@ package ExtUtils::MakeMaker;
 
 BEGIN {require 5.005_03;}
 
-$VERSION = "5.94_02";
+$VERSION = "5.95_01";
 $Version_OK = "5.49";   # Makefiles older than $Version_OK will die
                         # (Will be checked from MakeMaker version 4.13 onwards)
-($Revision = substr(q$Revision: 1.51 $, 10)) =~ s/\s+$//;
+($Revision = substr(q$Revision: 1.53 $, 10)) =~ s/\s+$//;
 
 require Exporter;
 use Config;
@@ -1817,7 +1817,7 @@ MakeMaker object. The following lines will be parsed o.k.:
 
     $VERSION = '1.00';
     *VERSION = \'1.01';
-    ( $VERSION ) = '$Revision: 1.51 $ ' =~ /\$Revision:\s+([^\s]+)/;
+    ( $VERSION ) = '$Revision: 1.53 $ ' =~ /\$Revision:\s+([^\s]+)/;
     $FOO::VERSION = '1.10';
     *FOO::VERSION = \'1.11';
     our $VERSION = 1.2.3;       # new for perl5.6.0 

diff --git a/lib/ExtUtils/t/testlib.t b/lib/ExtUtils/t/testlib.t
index be4d15a..d31396e 100644 (file)
--- a/lib/ExtUtils/t/testlib.t
+++ b/lib/ExtUtils/t/testlib.t
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl -Tw
 
 BEGIN {
     if( $ENV{PERL_CORE} ) {
@@ -6,12 +6,13 @@ BEGIN {
         @INC = '../lib';
     }
     else {
-        unshift @INC, 't/lib';
+        # ./lib is there so t/lib can be seen even after we chdir.
+        unshift @INC, 't/lib', './lib';
     }
 }
 chdir 't';
 
-use Test::More tests => 3;
+use Test::More tests => 4;
 
 BEGIN { 
     # non-core tests will have blib in their path.  We remove it
@@ -29,3 +30,5 @@ use_ok( 'ExtUtils::testlib' );
 
 @blib_paths = grep { /blib/ } @INC;
 is( @blib_paths, 2, 'ExtUtils::testlib added two @INC dirs!' );
+ok( !(grep !File::Spec->file_name_is_absolute($_), @blib_paths),
+                    '  and theyre absolute');

diff --git a/lib/ExtUtils/testlib.pm b/lib/ExtUtils/testlib.pm
index 6ea13ca..3f93135 100644 (file)
--- a/lib/ExtUtils/testlib.pm
+++ b/lib/ExtUtils/testlib.pm
@@ -1,9 +1,13 @@
 package ExtUtils::testlib;
-$VERSION = 1.12_01;
+$VERSION = 1.13_01;
 
-# 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
+use lib map File::Spec->rel2abs($_, getcwd()), qw(blib/arch blib/lib);
 1;
 __END__