X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Foptional_lighttpd-fastcgi.t;h=43a474e69cdcbfe77094e0e5e2de81748c23ee3f;hb=41593b496f3f55861439312779a9465f6a2c6600;hp=25d3bbf87d255a4b85a371937632d94e2cab8bf7;hpb=ec904766414ffebc2a3a3fcb13aaf2b7f7805ff4;p=catagits%2FCatalyst-Runtime.git diff --git a/t/optional_lighttpd-fastcgi.t b/t/optional_lighttpd-fastcgi.t index 25d3bbf..43a474e 100644 --- a/t/optional_lighttpd-fastcgi.t +++ b/t/optional_lighttpd-fastcgi.t @@ -10,6 +10,9 @@ 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 $@; eval "use Catalyst::Devel 1.0"; plan skip_all => 'Catalyst::Devel required' if $@; @@ -20,7 +23,9 @@ 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}; +my $lighttpd_bin = $ENV{LIGHTTPD_BIN} || `which lighttpd`; +chomp $lighttpd_bin; + plan skip_all => 'Please set LIGHTTPD_BIN to the path to lighttpd' unless $lighttpd_bin && -x $lighttpd_bin; @@ -94,7 +99,7 @@ while ( check_port( 'localhost', $port ) != 1 ) { # run the testsuite against the server $ENV{CATALYST_SERVER} = "http://localhost:$port"; -my @tests = glob('t/live_*'); +my @tests = (shift) || glob('t/live_*'); eval { runtests(@tests); };