X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Foptional_lighttpd-fastcgi.t;h=6b084cded1c601bcd761c27ba0e31bd443f0f7eb;hb=69eecfe56af710d0698539ea25dc1bc84282e013;hp=ff7a2eae4efb27b79fd19fe7d500dbcc9ce059aa;hpb=3fe3499686b81aea750bfabc669996a838d1c6f7;p=catagits%2FCatalyst-Runtime.git diff --git a/t/optional_lighttpd-fastcgi.t b/t/optional_lighttpd-fastcgi.t index ff7a2ea..6b084cd 100644 --- a/t/optional_lighttpd-fastcgi.t +++ b/t/optional_lighttpd-fastcgi.t @@ -4,7 +4,6 @@ use strict; use warnings; use File::Path; -use File::Slurp qw(write_file); use FindBin; use IO::Socket; use Test::More; @@ -15,12 +14,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; +my $lighttpd_bin = $ENV{LIGHTTPD_BIN}; +plan skip_all => 'Please set LIGHTTPD_BIN to run this test' + 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"; @@ -72,7 +73,7 @@ fastcgi.server = ( ) }; -write_file "$docroot/lighttpd.conf", $conf; +File::Slurp::write_file( "$docroot/lighttpd.conf", $conf ); my $pid = open my $lighttpd, "$lighttpd_bin -D -f $docroot/lighttpd.conf 2>&1 |" or die "Unable to spawn lighttpd: $!";