Change 13972: [PATCH lib/ExtUtils/t/MM_Win32.t] resolve problems with tools_other() and htmlifypods

[Jarkko Hietaniemi]

Change 13972 by jhi@alpha on 2001/12/31 04:07:35

        Subject: [PATCH lib/ExtUtils/t/MM_Win32.t] resolve problems with tools_other() 
and htmlifypods
        From: Abe Timmerman <[EMAIL PROTECTED]>
        Date: Mon, 31 Dec 2001 03:55:27 +0100
        Message-ID: <[EMAIL PROTECTED]>

Affected files ...

.... //depot/perl/lib/ExtUtils/t/MM_Win32.t#3 edit

Differences ...

==== //depot/perl/lib/ExtUtils/t/MM_Win32.t#3 (text) ====
Index: perl/lib/ExtUtils/t/MM_Win32.t
--- perl/lib/ExtUtils/t/MM_Win32.t.~1~  Sun Dec 30 21:15:05 2001
+++ perl/lib/ExtUtils/t/MM_Win32.t      Sun Dec 30 21:15:05 2001
@@ -254,12 +254,13 @@
         
     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()' );
 };
 
@@ -275,8 +276,11 @@
     }, '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
End of Patch.