Actualy fixed this test now

[catagits/Catalyst-Runtime.git] / t / optional_lighttpd-fastcgi-non-root.t

diff --git a/t/optional_lighttpd-fastcgi-non-root.t b/t/optional_lighttpd-fastcgi-non-root.t
index d76d489..6e9fe06 100644 (file)
--- a/t/optional_lighttpd-fastcgi-non-root.t
+++ b/t/optional_lighttpd-fastcgi-non-root.t
@@ -3,10 +3,26 @@
 use strict;
 use warnings;
 
+BEGIN {
+    use Test::More;
+
+    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} || 'lighttpd';
+    plan skip_all => 'Cannot find lighttpd, please set LIGHTTPD_BIN'
+    unless -x $lighttpd_bin;
+
+    plan tests => 1;
+
+};
+
 use File::Path;
 use FindBin;
 use IO::Socket;
-use Test::More;
 
 plan skip_all => 'set TEST_LIGHTTPD to enable this test' 
     unless $ENV{TEST_LIGHTTPD};
@@ -20,7 +36,9 @@ plan skip_all => 'File::Copy::Recursive required' if $@;
 eval "use Test::Harness";
 plan skip_all => 'Test::Harness required' if $@;
 
-my $lighttpd_bin = $ENV{LIGHTTPD_BIN};
+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;