X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=t%2Foptional_lighttpd-fastcgi-non-root.t;h=1a59e29908e712186e48438c66cf9ecff7749efb;hp=a28afe7ffaf828175737e44263a86d1d665a094c;hb=fc036112266c785163c051608821d66f42757ed3;hpb=3b6a7b7fe44304c4a7a0e34ca691551f1151c278

diff --git a/t/optional_lighttpd-fastcgi-non-root.t b/t/optional_lighttpd-fastcgi-non-root.t
index a28afe7..1a59e29 100644
--- a/t/optional_lighttpd-fastcgi-non-root.t
+++ b/t/optional_lighttpd-fastcgi-non-root.t
@@ -1,13 +1,18 @@
-#!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 File::Slurp qw(write_file);
 use FindBin;
 use IO::Socket;
-use Test::More;
+
+eval "use FCGI";
+plan skip_all => 'FCGI required' if $@;
 
 eval "use Catalyst::Devel 1.0";
 plan skip_all => 'Catalyst::Devel required' if $@;
@@ -15,9 +20,14 @@ plan skip_all => 'Catalyst::Devel required' if $@;
 eval "use File::Copy::Recursive";
 plan skip_all => 'File::Copy::Recursive required' if $@;
 
-my $lighttpd_bin = $ENV{LIGHTTPD_BIN} || 'lighttpd';
-plan skip_all => 'Cannot find lighttpd, please set LIGHTTPD_BIN'
-    unless -x $lighttpd_bin;
+eval "use Test::Harness";
+plan skip_all => 'Test::Harness required' if $@;
+
+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;
 
 plan tests => 1;
 
@@ -27,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' );
 
@@ -41,11 +51,12 @@ 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",
     "mod_fastcgi",
+    "mod_rewrite",
     "mod_accesslog"
 )
 
@@ -57,35 +68,50 @@ accesslog.filename = "$docroot/access.log"
 server.bind = "127.0.0.1"
 server.port = $port
 
+# Work around inability to hit http://localhost/deep/path
+# without a trailing slash 
+url.rewrite = ( "deep/path\$" => "deep/path/" )
+
 # catalyst app specific fcgi setup
 fastcgi.server = (
     "/deep/path" => (
         "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"
+            )
         )
     )
 )
-};
+END
 
-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/deep/path";
-system( 'prove -r -Ilib/ t/live_*' );
+
+my @tests = (shift) || glob('t/aggregate/live_*');
+eval {
+    runtests(@tests);
+};
+ok(!$@, 'lighttpd tests ran OK');
 
 # shut it down
 kill 'INT', $pid;
@@ -94,8 +120,6 @@ close $lighttpd;
 # clean up
 rmtree "$FindBin::Bin/../t/tmp" if -d "$FindBin::Bin/../t/tmp";
 
-ok( 'done' );
-
 sub check_port {
     my ( $host, $port ) = @_;
 
@@ -111,4 +135,4 @@ sub check_port {
     else {
         return 0;
     }
-}
\ No newline at end of file
+}