X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Foptional_lighttpd-fastcgi.t;h=25d3bbf87d255a4b85a371937632d94e2cab8bf7;hb=ec904766414ffebc2a3a3fcb13aaf2b7f7805ff4;hp=6b084cded1c601bcd761c27ba0e31bd443f0f7eb;hpb=381e2cab022817530b18712d6a7194eb33c6842a;p=catagits%2FCatalyst-Runtime.git

diff --git a/t/optional_lighttpd-fastcgi.t b/t/optional_lighttpd-fastcgi.t
index 6b084cd..25d3bbf 100644
--- a/t/optional_lighttpd-fastcgi.t
+++ b/t/optional_lighttpd-fastcgi.t
@@ -8,20 +8,24 @@ use FindBin;
 use IO::Socket;
 use Test::More;
 
+plan skip_all => 'set TEST_LIGHTTPD to enable this test' 
+    unless $ENV{TEST_LIGHTTPD};
+
 eval "use Catalyst::Devel 1.0";
 plan skip_all => 'Catalyst::Devel required' if $@;
 
 eval "use File::Copy::Recursive";
 plan skip_all => 'File::Copy::Recursive required' if $@;
 
+eval "use Test::Harness";
+plan skip_all => 'Test::Harness required' if $@;
+
 my $lighttpd_bin = $ENV{LIGHTTPD_BIN};
-plan skip_all => 'Please set LIGHTTPD_BIN to run this test'
+plan skip_all => 'Please set LIGHTTPD_BIN to the path to lighttpd'
     unless $lighttpd_bin && -x $lighttpd_bin;
 
 plan tests => 1;
 
-require File::Slurp;
-
 # clean up
 rmtree "$FindBin::Bin/../t/tmp" if -d "$FindBin::Bin/../t/tmp";
 
@@ -42,7 +46,7 @@ my $port    = 8529;
 # Clean up docroot path
 $docroot =~ s{/t/..}{};
 
-my $conf = qq{
+my $conf = <<"END";
 # basic lighttpd config file for testing fcgi+catalyst
 server.modules = (
     "mod_access",
@@ -71,22 +75,30 @@ fastcgi.server = (
         )
     )
 )
-};
+END
 
-File::Slurp::write_file( "$docroot/lighttpd.conf", $conf );
+open(my $lightconf, '>', "$docroot/lighttpd.conf") 
+  or die "Can't open $docroot/lighttpd.conf: $!";
+print {$lightconf} $conf or die "Write error: $!";
+close $lightconf;
 
 my $pid = open my $lighttpd, "$lighttpd_bin -D -f $docroot/lighttpd.conf 2>&1 |" 
     or die "Unable to spawn lighttpd: $!";
     
 # wait for it to start
-print "Waiting for server to start...\n";
 while ( check_port( 'localhost', $port ) != 1 ) {
+    diag "Waiting for server to start...";
     sleep 1;
 }
 
 # run the testsuite against the server
 $ENV{CATALYST_SERVER} = "http://localhost:$port";
-system( 'prove -r -Ilib/ t/live_*' );
+
+my @tests = glob('t/live_*');
+eval {
+    runtests(@tests);
+};
+ok(!$@, 'lighttpd tests ran OK');
 
 # shut it down
 kill 'INT', $pid;
@@ -95,8 +107,6 @@ close $lighttpd;
 # clean up
 rmtree "$FindBin::Bin/../t/tmp" if -d "$FindBin::Bin/../t/tmp";
 
-ok( 'done' );
-
 sub check_port {
     my ( $host, $port ) = @_;
 
@@ -112,4 +122,4 @@ sub check_port {
     else {
         return 0;
     }
-}
\ No newline at end of file
+}