-#!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;
+use Config ();
-plan skip_all => 'set TEST_LIGHTTPD to enable this test'
- unless $ENV{TEST_LIGHTTPD};
-
eval "use FCGI";
plan skip_all => 'FCGI required' if $@;
my $port = 8529;
# Clean up docroot path
-$docroot =~ s{/t/..}{};
+$docroot =~ s{/t/\.\.}{};
+
+my $perl5lib = join($Config::Config{path_sep}, "$docroot/../../lib", $ENV{PERL5LIB} || ());
my $conf = <<"END";
# basic lighttpd config file for testing fcgi+catalyst
"max-procs" => 1,
"idle-timeout" => 20,
"bin-environment" => (
- "PERL5LIB" => "$docroot/../../lib"
+ "PERL5LIB" => "$perl5lib"
)
)
)
)
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...";