From 0c8ebbeb606561da6acb4d576fb8ab24571fa2dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20B=C3=BChler?= Date: Wed, 30 Jul 2008 17:40:09 +0000 Subject: [PATCH] [tests] Fix fastcgi php finding git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2249 152afb58-edef-0310-8abb-c4023f1b3aa9 --- tests/fastcgi-13.conf | 2 +- tests/mod-fastcgi.t | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/fastcgi-13.conf b/tests/fastcgi-13.conf index 72c5b9f9..418170b2 100644 --- a/tests/fastcgi-13.conf +++ b/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" ), ) ) diff --git a/tests/mod-fastcgi.t b/tests/mod-fastcgi.t index d03ed2fc..b94d684a 100755 --- a/tests/mod-fastcgi.t +++ b/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} = ( <