X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=t%2Foptional_lighttpd-fastcgi.t;h=fefa06adca4d0e06c0719b06d706d5c4cc5da56c;hp=d5e42d4e905a37891a49b0d173f4cd1916ce63d3;hb=88e5a8b0c4d28e46b8ba6b6b9567063e57af9063;hpb=868a7cca6687d5a4df03ad4f70f60fc124033f62 diff --git a/t/optional_lighttpd-fastcgi.t b/t/optional_lighttpd-fastcgi.t index d5e42d4..fefa06a 100644 --- a/t/optional_lighttpd-fastcgi.t +++ b/t/optional_lighttpd-fastcgi.t @@ -1,16 +1,16 @@ -#!perl - use strict; use warnings; +use Test::More; +BEGIN { + plan skip_all => 'set TEST_LIGHTTPD to enable this test' + unless $ENV{TEST_LIGHTTPD}; +} + use File::Path; use FindBin; use IO::Socket; -use Test::More; -plan skip_all => 'set TEST_LIGHTTPD to enable this test' - unless $ENV{TEST_LIGHTTPD}; - eval "use FCGI"; plan skip_all => 'FCGI required' if $@; @@ -85,14 +85,14 @@ fastcgi.server = ( ) END -open(my $lightconf, '>', "$docroot/lighttpd.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 |" +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 while ( check_port( 'localhost', $port ) != 1 ) { diag "Waiting for server to start..."; @@ -102,7 +102,7 @@ while ( check_port( 'localhost', $port ) != 1 ) { # run the testsuite against the server $ENV{CATALYST_SERVER} = "http://localhost:$port"; -my @tests = (shift) || glob('t/live_*'); +my @tests = (shift) || glob('t/aggregate/live_*'); eval { runtests(@tests); };