develooper Front page | perl.perl5.porters | Postings from December 2001

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

Thread Next
From:
Abe Timmerman
Date:
December 30, 2001 18:54
Subject:
[PATCH lib/ExtUtils/t/MM_Win32.t] resolve problems with tools_other() and htmlifypods
Message ID:
u0kv2ussgukot09trgjkosn8uootjkcebv@4ax.com
With thanks to Nick Ing-Simmons.

In the tools_other() test I didn't get the 'dmake' logic correct.

In the htmlifypods() test I didn't copy the $pod2html_exe fully.


--- ../orig-perl/perl/lib/ExtUtils/t/MM_Win32.t	Sat Dec 29 17:23:45 2001
+++ lib/ExtUtils/t/MM_Win32.t	Mon Dec 31 03:30:26 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


-- 
Good luck, Abe
Amsterdam Perl Mongers http://amsterdam.pm.org
perl -wle '%_=qw(Just Just another Perl Perl another hacker hacker);print join" ",map$_{$_}=>sort keys%_'

Thread Next


nntp.perl.org: Perl Programming lists via nntp and http.
Comments to Ask Bjørn Hansen at ask@perl.org | Group listing | About