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;
+
+eval "use FCGI";
+plan skip_all => 'FCGI required' if $@;
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 $@;
-my $lighttpd_bin = $ENV{LIGHTTPD_BIN};
-plan skip_all => 'Please set LIGHTTPD_BIN to run this test'
+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;
-require File::Slurp;
-
# clean up
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' );
# 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",
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"
+ )
)
)
)
-};
+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 = (shift) || glob('t/aggregate/live_*');
+eval {
+ runtests(@tests);
+};
+ok(!$@, 'lighttpd tests ran OK');
# shut it down
kill 'INT', $pid;
# clean up
rmtree "$FindBin::Bin/../t/tmp" if -d "$FindBin::Bin/../t/tmp";
-ok( 'done' );
-
sub check_port {
my ( $host, $port ) = @_;
else {
return 0;
}
-}
\ No newline at end of file
+}