X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/a920027265b3508d5f604d78b1dec24fdaf876e7..84a9aad5c224d0cf574731960d4cf03373a57222:/lib/ExtUtils/t/MM_Win32.t

diff --git a/lib/ExtUtils/t/MM_Win32.t b/lib/ExtUtils/t/MM_Win32.t
index 400efbd..7753926 100644
--- a/lib/ExtUtils/t/MM_Win32.t
+++ b/lib/ExtUtils/t/MM_Win32.t
@@ -2,8 +2,7 @@
 
 BEGIN {
 	chdir 't' if -d 't';
-#	@INC = '../lib';
-push @INC, '../lib';
+	@INC = '../lib';
 }
 
 use Test::More;
@@ -12,7 +11,7 @@ BEGIN {
 	if ($^O =~ /MSWin32/i) {
 		plan tests => 44;
 	} else {
-		plan skip_all => 'Test irrelevant outside of MSWin32';
+		plan skip_all => 'This is not Win32';
 	}
 }
 
@@ -255,12 +254,13 @@ unlink "${script_name}$script_ext" if -f "${script_name}$script_ext";
         
     my $bin_sh = ( $Config{make} =~ /^dmake/i 
                ? "" : ($Config{sh} || 'cmd /c') . "\n" );
+    $bin_sh = "SHELL = $bin_sh" if $bin_sh;
 
     my $tools = join "\n", map "$_ = $mm_w32->{ $_ }"
     	=> qw(CHMOD CP LD MV NOOP RM_F RM_RF TEST_F TOUCH UMASK_NULL DEV_NULL);
 
     like( $mm_w32->tools_other(),
-          qr/^SHELL = \Q$bin_sh$tools/m,
+          qr/^\Q$bin_sh$tools/m,
           'tools_other()' );
 };
 
@@ -276,8 +276,11 @@ unlink "${script_name}$script_ext" if -f "${script_name}$script_ext";
     }, 'MM';
     my $pods = join " \\\n\t", keys %{$mm_w32->{HTMLLIBPODS}}, 
                                keys %{$mm_w32->{HTMLSCRIPTPODS}};
+
     my $pod2html_exe = $mm_w32->catfile($Config{scriptdirexp},'pod2html');
-    $pod2html_exe = $mm_w32->perl_script( $pod2html_exe );
+    unless ( $pod2html_exe = $mm_w32->perl_script( $pod2html_exe ) ) {
+        $pod2html_exe = '-S pod2html';
+    }
 
     like( $mm_w32->htmlifypods(),
           qr/^POD2HTML_EXE\ =\ \Q$pod2html_exe\E\n