From: Steve Hay <SteveHay@planit.com>
Date: Fri, 24 Mar 2006 13:01:32 +0000 (+0000)
Subject: Fix broken MM_Win32.t tests following 27590
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=3461c7c9350e177b6bce70d393133005ce4bb689;p=p5sagit%2Fp5-mst-13.2.git

Fix broken MM_Win32.t tests following 27590

Test 31 was failing because 27590 had undone part of 25627.
Test 41 was failing because the change to pasthru() in MM_Win32.pm
means that $self->{MAKE} now needs to be initialized.

p4raw-id: //depot/perl@27595
---

diff --git a/lib/ExtUtils/t/MM_Win32.t b/lib/ExtUtils/t/MM_Win32.t
index ca870d5..dbfa55a 100644
--- a/lib/ExtUtils/t/MM_Win32.t
+++ b/lib/ExtUtils/t/MM_Win32.t
@@ -37,6 +37,7 @@ my $MM = bless {
                 MAKEFILE => 'Makefile',
                 RM_RF   => 'rm -rf',
                 MV      => 'mv',
+                MAKE    => $Config{make},
                }, 'MM';
 
 
@@ -163,15 +164,10 @@ delete $ENV{PATHEXT} unless $had_pathext;
 }
 
 # path()
-my $had_path = exists $ENV{PATH};
 {
-    my @path_eg = ( qw( . .. ), 'C:\\Program Files' );
-    local $ENV{PATH} = join ';', @path_eg;
-    ok( eq_array( [ $MM->path() ], [ @path_eg ] ),
+    ok( eq_array( [ $MM->path() ], [ File::Spec->path ] ),
         'path() [preset]' );
 }
-# Bug in Perl.  local $ENV{FOO} will not delete key afterwards.
-delete $ENV{PATH} unless $had_path;
 
 # static_lib() should look into that
 # dynamic_bs() should look into that