diff options
| author | Stefan Bühler <stbuehler@web.de> | 2015-08-22 20:51:08 +0000 |
|---|---|---|
| committer | Stefan Bühler <stbuehler@web.de> | 2015-08-22 20:51:08 +0000 |
| commit | 87c5ec96517b9f551f5a6100c9e689073369a669 (patch) | |
| tree | 5ebb8e804634a3414221e57def275a7594edfa81 /tests/mod-fastcgi.t | |
| parent | 5c48617737796edb53fe9d89dbc179465fec5cb9 (diff) | |
| download | lighttpd-git-87c5ec96517b9f551f5a6100c9e689073369a669.tar.gz | |
[tests] search for perl in PATH instead of /usr/bin; whitespace + test config cleanups
From: Stefan Bühler <stbuehler@web.de>
git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@3019 152afb58-edef-0310-8abb-c4023f1b3aa9
Diffstat (limited to 'tests/mod-fastcgi.t')
| -rwxr-xr-x | tests/mod-fastcgi.t | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/tests/mod-fastcgi.t b/tests/mod-fastcgi.t index 691bce2e..b3680d0d 100755 --- a/tests/mod-fastcgi.t +++ b/tests/mod-fastcgi.t @@ -15,13 +15,10 @@ my $tf = LightyTest->new(); 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); - skip "no php binary found", 1 unless -x $phpbin; - ok(-1 != ($php_child = $tf->spawnfcgi($phpbin, 1026)), "Spawning php"); + skip "no php binary found", 1 unless $LightyTest::HAVE_PHP; + ok(-1 != ($php_child = $tf->spawnfcgi($ENV{'PHP'}, 1026)), "Spawning php"); } SKIP: { @@ -295,7 +292,7 @@ EOF } SKIP: { - skip "no php found", 5 unless -x $phpbin; + skip "no php found", 5 unless $LightyTest::HAVE_PHP; $tf->{CONFIGFILE} = 'fastcgi-13.conf'; ok($tf->start_proc == 0, "Starting lighttpd with $tf->{CONFIGFILE}") or die(); $t->{REQUEST} = ( <<EOF |