X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Foptional_lighttpd-fastcgi.t;h=c09e0ca3a12095eaff8fa1b1d4c65a910c8d0c22;hb=6b2a933b5b3820e494f9b5804c7c2eb6083bcf09;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..c09e0ca 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;
 
@@ -32,7 +37,7 @@ rmtree "$FindBin::Bin/../t/tmp" if -d "$FindBin::Bin/../t/tmp";
 # create a TestApp and copy the test libs into it
 mkdir "$FindBin::Bin/../t/tmp";
 chdir "$FindBin::Bin/../t/tmp";
-system "perl -I$FindBin::Bin/../lib $FindBin::Bin/../script/catalyst.pl TestApp";
+system "$^X -I$FindBin::Bin/../lib $FindBin::Bin/../script/catalyst.pl TestApp";
 chdir "$FindBin::Bin/..";
 File::Copy::Recursive::dircopy( 't/lib', 't/tmp/TestApp/lib' );
 
@@ -66,12 +71,15 @@ server.port = $port
 fastcgi.server = (
     "" => (
         "FastCgiTest" => (
-            "socket"       => "$docroot/test.socket",
-            "check-local"  => "disable",
-            "bin-path"     => "$docroot/TestApp/script/testapp_fastcgi.pl",
-            "min-procs"    => 1,
-            "max-procs"    => 1,
-            "idle-timeout" => 20
+            "socket"          => "$docroot/test.socket",
+            "check-local"     => "disable",
+            "bin-path"        => "$docroot/TestApp/script/testapp_fastcgi.pl",
+            "min-procs"       => 1,
+            "max-procs"       => 1,
+            "idle-timeout"    => 20,
+            "bin-environment" => (
+                "PERL5LIB" => "$docroot/../../lib"
+            )
         )
     )
 )
@@ -94,7 +102,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/aggregate/live_*');
 eval {
     runtests(@tests);
 };