Browse Source

[tests] Fix fastcgi php finding

git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2249 152afb58-edef-0310-8abb-c4023f1b3aa9
svn/tags/lighttpd-1.4.20
Stefan Bühler 14 years ago
parent
commit
0c8ebbeb60
  1. 2
      tests/fastcgi-13.conf
  2. 3
      tests/mod-fastcgi.t

2
tests/fastcgi-13.conf

@ -84,7 +84,7 @@ fastcgi.server = ( ".php" => (
"grisu" => (
"host" => "127.0.0.1",
"port" => 1048,
"bin-path" => "/usr/bin/php-cgi",
"bin-path" => env.PHP,
"bin-copy-environment" => ( "PATH", "SHELL", "USER" ),
)
)

3
tests/mod-fastcgi.t

@ -16,6 +16,7 @@ my $t;
my $php_child = -1;
my $phpbin = (defined $ENV{'PHP'} ? $ENV{'PHP'} : '/usr/bin/php-cgi');
$ENV{'PHP'} = $phpbin;
SKIP: {
skip "PHP already running on port 1026", 1 if $tf->listening_on(1026);
@ -238,7 +239,7 @@ EOF
}
SKIP: {
skip "no php found", 5 unless -x "/usr/bin/php-cgi";
skip "no php found", 5 unless -x $phpbin;
$tf->{CONFIGFILE} = 'fastcgi-13.conf';
ok($tf->start_proc == 0, "Starting lighttpd with $tf->{CONFIGFILE}") or die();
$t->{REQUEST} = ( <<EOF

Loading…
Cancel
Save