Fixed http tests to use local libs and run better on win32

diff --git a/t/optional/http-server-restart.t b/t/optional/http-server-restart.t
index d8fa69f..de618ae 100644 (file)
--- 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\r
 mkdir "$FindBin::Bin/../../t/var";\r
 chdir "$FindBin::Bin/../../t/var";\r
-system "$FindBin::Bin/../../script/catalyst.pl TestApp";\r
+system "perl $FindBin::Bin/../../script/catalyst.pl TestApp";\r
 chdir "$FindBin::Bin/../..";\r
 File::Copy::Recursive::dircopy( 't/live/lib', 't/var/TestApp/lib' );\r
 \r
 # spawn the standalone HTTP server\r
 my $port = 30000 + int rand(1 + 10000);\r
 my $pid = open my $server, \r
-    "$FindBin::Bin/../../t/var/TestApp/script/testapp_server.pl -port $port -restart 2>&1 |"\r
+    "perl -I$FindBin::Bin/../../lib $FindBin::Bin/../../t/var/TestApp/script/testapp_server.pl -port $port -restart 2>&1 |"\r
     or die "Unable to spawn standalone HTTP server: $!";\r
 \r
 # wait for it to start\r
@@ -89,7 +89,7 @@ for ( 1..20 ) {
 }\r
 \r
 # shut it down\r
-kill 2, $pid;\r
+kill 'INT', $pid;\r
 close $server;\r
 \r
 # clean up\r

diff --git a/t/optional/http-server.t b/t/optional/http-server.t
index 664ee36..7296973 100644 (file)
--- a/t/optional/http-server.t
+++ b/t/optional/http-server.t
@@ -19,14 +19,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 2>&1 |"
+    "perl -I$FindBin::Bin/../../lib $FindBin::Bin/../../t/var/TestApp/script/testapp_server.pl -port $port 2>&1 |"
     or die "Unable to spawn standalone HTTP server: $!";
 
 # wait for it to start
@@ -40,7 +40,7 @@ $ENV{CATALYST_SERVER} = "http://localhost:$port";
 system( 'prove -r -Ilib/ t/live/' );
 
 # shut it down
-kill 2, $pid;
+kill 'INT', $pid;
 close $server;
 
 # clean up