X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Foptional_lighttpd-fastcgi-non-root.t;h=d0a1183990e3166ea90ba92590051c4486be6f64;hb=69eecfe56af710d0698539ea25dc1bc84282e013;hp=a28afe7ffaf828175737e44263a86d1d665a094c;hpb=3b6a7b7fe44304c4a7a0e34ca691551f1151c278;p=catagits%2FCatalyst-Runtime.git diff --git a/t/optional_lighttpd-fastcgi-non-root.t b/t/optional_lighttpd-fastcgi-non-root.t index a28afe7..d0a1183 100644 --- a/t/optional_lighttpd-fastcgi-non-root.t +++ b/t/optional_lighttpd-fastcgi-non-root.t @@ -15,12 +15,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 +74,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: $!";