summaryrefslogtreecommitdiff
path: root/tests/mod-fastcgi.t
diff options
context:
space:
mode:
authorGlenn Strauss <gstrauss@gluelogic.com>2018-12-18 00:08:46 -0500
committerGlenn Strauss <gstrauss@gluelogic.com>2018-12-18 00:08:46 -0500
commita1077d18cb36b0cbdfb9da7138ba302f2090db78 (patch)
treede4251da2737b07b88c27e44203a3f1878896167 /tests/mod-fastcgi.t
parentfe3dc1796894d22ad60da24d2bfc25fbf612861c (diff)
downloadlighttpd-git-a1077d18cb36b0cbdfb9da7138ba302f2090db78.tar.gz
[tests] more test config cleanup
Diffstat (limited to 'tests/mod-fastcgi.t')
-rwxr-xr-xtests/mod-fastcgi.t19
1 files changed, 2 insertions, 17 deletions
diff --git a/tests/mod-fastcgi.t b/tests/mod-fastcgi.t
index a03360bb..7a00963c 100755
--- a/tests/mod-fastcgi.t
+++ b/tests/mod-fastcgi.t
@@ -7,22 +7,15 @@ BEGIN {
}
use strict;
-use Test::More tests => 48;
+use Test::More tests => 46;
use LightyTest;
my $tf = LightyTest->new();
my $t;
-my $php_child = -1;
SKIP: {
- skip "PHP already running on port 1026", 1 if $tf->listening_on(1026);
- skip "no php binary found", 1 unless $LightyTest::HAVE_PHP;
- ok(-1 != ($php_child = $tf->spawnfcgi($ENV{'PHP'}, 1026)), "Spawning php");
-}
-
-SKIP: {
- skip "no PHP running on port 1026", 31 unless $tf->listening_on(1026);
+ skip "no php binary found", 31 unless $LightyTest::HAVE_PHP;
$tf->{CONFIGFILE} = 'fastcgi-10.conf';
ok($tf->start_proc == 0, "Starting lighttpd") or goto cleanup;
@@ -262,12 +255,6 @@ EOF
}
SKIP: {
- skip "PHP not started, cannot stop it", 1 unless $php_child != -1;
- ok(0 == $tf->endspawnfcgi($php_child), "Stopping php");
- $php_child = -1;
-}
-
-SKIP: {
skip "no fcgi-auth, fcgi-responder found", 15
unless (-x $tf->{BASEDIR}."/tests/fcgi-auth" || -x $tf->{BASEDIR}."/tests/fcgi-auth.exe")
&& (-x $tf->{BASEDIR}."/tests/fcgi-responder" || -x $tf->{BASEDIR}."/tests/fcgi-responder.exe");
@@ -392,6 +379,4 @@ exit 0;
cleanup: ;
-$tf->endspawnfcgi($php_child) if $php_child != -1;
-
die();