Test::Harness 2.25 -> 2.26

Message-id: <20020620001208.GX1232@ool-18b93024.dyn.optonline.net>

p4raw-id: //depot/perl@17313

diff --git a/lib/Test/Harness.pm b/lib/Test/Harness.pm
index d79a6cb..efb9a1f 100644 (file)
--- a/lib/Test/Harness.pm
+++ b/lib/Test/Harness.pm
@@ -1,5 +1,5 @@
 # -*- Mode: cperl; cperl-indent-level: 4 -*-
-# $Id: Harness.pm,v 1.37 2002/06/16 06:55:09 schwern Exp $
+# $Id: Harness.pm,v 1.38 2002/06/19 21:01:01 schwern Exp $
 
 package Test::Harness;
 
@@ -22,7 +22,7 @@ use vars qw($VERSION $Verbose $Switches $Have_Devel_Corestack $Curtest
 
 $Have_Devel_Corestack = 0;
 
-$VERSION = '2.25';
+$VERSION = '2.26';
 
 $ENV{HARNESS_ACTIVE} = 1;
 

diff --git a/lib/Test/Harness/Changes b/lib/Test/Harness/Changes
index 53862ff..892c243 100644 (file)
--- a/lib/Test/Harness/Changes
+++ b/lib/Test/Harness/Changes
@@ -1,5 +1,9 @@
 Revision history for Perl extension Test::Harness
 
+2.26  Wed Jun 19 16:58:02 EDT 2002
+    - Workaround for MacPerl's lack of a working putenv.  It will never 
+      see the PERL5LIB environment variable (perl@16942).
+
 2.25  Sun Jun 16 03:00:33 EDT 2002
     - $Strap is now a global to allow Test::Harness::Straps
       experimentation.

diff --git a/lib/Test/Harness/Straps.pm b/lib/Test/Harness/Straps.pm
index 8f3d116..7530045 100644 (file)
--- a/lib/Test/Harness/Straps.pm
+++ b/lib/Test/Harness/Straps.pm
@@ -1,12 +1,12 @@
 # -*- Mode: cperl; cperl-indent-level: 4 -*-
-# $Id: Straps.pm,v 1.11 2002/06/16 06:55:10 schwern Exp $
+# $Id: Straps.pm,v 1.13 2002/06/19 21:01:04 schwern Exp $
 
 package Test::Harness::Straps;
 
 use strict;
 use vars qw($VERSION);
 use Config;
-$VERSION = '0.13';
+$VERSION = '0.14';
 
 use Test::Harness::Assert;
 use Test::Harness::Iterator;
@@ -326,10 +326,15 @@ sub _switches {
     $s .= " $ENV{'HARNESS_PERL_SWITCHES'}"
       if exists $ENV{'HARNESS_PERL_SWITCHES'};
 
-    # When taint mode is on, PERL5LIB is ignored.  So we need to put
-    # all that on the command line as -Is.
-    $s .= join " ", qq[ "-$1"], map {qq["-I$_"]} $self->_filtered_INC
-      if $first =~ /^#!.*\bperl.*\s-\w*([Tt]+)/;
+    if ($first =~ /^#!.*\bperl.*\s-\w*([Tt]+)/) {
+        # When taint mode is on, PERL5LIB is ignored.  So we need to put
+        # all that on the command line as -Is.
+        $s .= join " ", qq[ "-$1"], map {qq["-I$_"]} $self->_filtered_INC;
+    }
+    elsif ($^O eq 'MacOS') {
+        # MacPerl's putenv is broken, so it will not see PERL5LIB.
+        $s .= join " ", map {qq["-I$_"]} $self->_filtered_INC;
+    }
 
     close(TEST) or print "can't close $file. $!\n";