[Catalyst-commits] r12224 - Catalyst-Devel/1.00/trunk/t

[kmx at dev.catalyst.perl.org]

Author: kmx
Date: 2009-12-06 19:43:32 +0000 (Sun, 06 Dec 2009)
New Revision: 12224

Modified:
   Catalyst-Devel/1.00/trunk/t/generated_app.t
Log:
Win32 compatibility fix:
1) hardcoded 'make' replaced by: $Config{make}||'make'
2) testing executable flags skipped on Win32

Modified: Catalyst-Devel/1.00/trunk/t/generated_app.t
===================================================================
--- Catalyst-Devel/1.00/trunk/t/generated_app.t	2009-12-06 18:51:28 UTC (rev 12223)
+++ Catalyst-Devel/1.00/trunk/t/generated_app.t	2009-12-06 19:43:32 UTC (rev 12224)
@@ -8,6 +8,7 @@
 use Catalyst::Devel;
 use Catalyst::Helper;
 use Test::More;
+use Config;
 
 eval "use IPC::Run3";
 plan skip_all => 'These tests require IPC::Run3' if $@;
@@ -78,7 +79,8 @@
 
 command_ok( [ $^X, 'Makefile.PL' ] );
 ok -e "Makefile", "Makefile generated";
-command_ok( [ 'make' ] );
+#NOTE: do not assume that 'make' is always 'make' as e.g. Win32/strawberry perl uses 'dmake'
+command_ok( [ ($Config{make} || 'make') ] );
 
 run_generated_component_tests();
 
@@ -122,7 +124,10 @@
     my $fn = shift;
     ok -r $fn, "Have $fn in generated app";
     if ($fn =~ /script/) {
-        ok -x $fn, "$fn is executable";
+        SKIP: {
+            skip 'Executable file flag test does not make sense on Win32', 1 if ($^O eq 'MSWin32');
+            ok -x $fn, "$fn is executable";
+       }
     }
     if ($fn =~ /\.p[ml]$/) {
         runperl( '-c', $fn, "$fn compiles" );