X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Foptional%2Fhttp-server-restart.t;fp=t%2Foptional%2Fhttp-server-restart.t;h=de618ae5889bc48084002b803e326007c3bce389;hb=e1b364f4ee5165fd5cd9473e89e4c31c10d00cf2;hp=d8fa69f9a72a05ef70eefec0f7774145c1cd8c2a;hpb=55ddccaeec20bf8b2f6a6784bf3084bada8c24f1;p=catagits%2FCatalyst-Runtime.git diff --git a/t/optional/http-server-restart.t b/t/optional/http-server-restart.t index d8fa69f..de618ae 100644 --- a/t/optional/http-server-restart.t +++ b/t/optional/http-server-restart.t @@ -24,14 +24,14 @@ rmtree "$FindBin::Bin/../../t/var" if -d "$FindBin::Bin/../../t/var"; # create a TestApp and copy the test libs into it mkdir "$FindBin::Bin/../../t/var"; chdir "$FindBin::Bin/../../t/var"; -system "$FindBin::Bin/../../script/catalyst.pl TestApp"; +system "perl $FindBin::Bin/../../script/catalyst.pl TestApp"; chdir "$FindBin::Bin/../.."; File::Copy::Recursive::dircopy( 't/live/lib', 't/var/TestApp/lib' ); # spawn the standalone HTTP server my $port = 30000 + int rand(1 + 10000); my $pid = open my $server, - "$FindBin::Bin/../../t/var/TestApp/script/testapp_server.pl -port $port -restart 2>&1 |" + "perl -I$FindBin::Bin/../../lib $FindBin::Bin/../../t/var/TestApp/script/testapp_server.pl -port $port -restart 2>&1 |" or die "Unable to spawn standalone HTTP server: $!"; # wait for it to start @@ -89,7 +89,7 @@ for ( 1..20 ) { } # shut it down -kill 2, $pid; +kill 'INT', $pid; close $server; # clean up