convert to Distar

[catagits/Catalyst-Devel.git] / t / generated_app.t

diff --git a/t/generated_app.t b/t/generated_app.t
index d83032e..2b50377 100644 (file)
--- a/t/generated_app.t
+++ b/t/generated_app.t
@@ -8,9 +8,7 @@ use File::Basename qw( dirname );
 use Catalyst::Helper;
 use Test::More;
 use Config;
-
-eval "use IPC::Run3";
-plan skip_all => 'These tests require IPC::Run3' if $@;
+use IPC::Open3 qw( open3 );
 
 my $helper_lib = abs_path(catdir(dirname($INC{'Catalyst/Helper.pm'}), updir));
 
@@ -23,8 +21,14 @@ my $instdir = tempdir(CLEANUP => 1);
 
 my $MAKE = $Config{make} || 'make';
 
-$ENV{PERL_MM_OPT} = "INSTALL_BASE=$instdir";
-$ENV{INSTALL_BASE} = $instdir;
+my $escaped_path = $instdir;
+$escaped_path =~ s/\\/\\\\/g;
+if ($escaped_path =~ s/ /\\ /g) {
+  $escaped_path = qq{"$escaped_path"};
+}
+
+$ENV{PERL_MM_OPT} = "INSTALL_BASE=$escaped_path";
+
 if ($ENV{MAKEFLAGS}) {
     $ENV{MAKEFLAGS} =~ s/PREFIX=[^\s]+//;
     $ENV{MAKEFLAGS} =~ s/INSTALL_BASE=[^\s]+//;
@@ -33,7 +37,7 @@ if ($ENV{MAKEFLAGS}) {
 my $dir = tempdir(CLEANUP => 1);
 my $devnull = devnull;
 
-diag "Generated app is in $dir";
+note "Generated app is in $dir";
 
 chdir $dir or die "Cannot chdir to $dir: $!";
 
@@ -129,7 +133,7 @@ my $server_script_new = do {
 
 is $server_script, $server_script_new;
 
-diag "Installed app is in $instdir";
+note "Installed app is in $instdir";
 command_ok( [ $MAKE, 'install' ] );
 
 my $inst_app_dir = catdir($instdir);
@@ -167,17 +171,21 @@ done_testing;
 
 sub command_ok {
     my $cmd = shift;
-    my $desc = shift;
+    my $desc = shift || "Exit status ok for '@{$cmd}'";
 
-    my $stdout;
-    my $stderr;
-    run3( $cmd, \undef, \$stdout, \$stderr );
+    open my $stdin, '<', $devnull
+        or die "Cannot read $devnull: $!";
 
-    $desc ||= "Exit status ok for '@{$cmd}'";
-    unless ( is $? >> 8, 0, $desc ) {
-        diag "STDOUT:\n$stdout" if defined $stdout;
-        diag "STDERR:\n$stderr" if defined $stderr;
-    }
+    my $pid = open3( $stdin, my $stdout, undef, @$cmd );
+    my $output = do { local $/; <$stdout> };
+    waitpid $pid, 0;
+
+    my $result = is $?, 0, $desc;
+
+    diag "output:\n$output"
+      if !$result;
+
+    return $result;
 }
 
 sub runperl {