summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/404-handler.conf1
-rwxr-xr-xtests/LightyTest.pm25
-rw-r--r--tests/bug-06.conf1
-rw-r--r--tests/bug-12.conf1
-rw-r--r--tests/condition.conf1
-rw-r--r--tests/fastcgi-10.conf1
-rw-r--r--tests/fastcgi-13.conf1
-rw-r--r--tests/fastcgi-auth.conf1
-rw-r--r--tests/fastcgi-responder.conf1
-rw-r--r--tests/lighttpd.conf1
-rw-r--r--tests/lowercase.conf1
-rw-r--r--tests/mod-extforward.conf1
-rwxr-xr-xtests/mod-proxy.t2
-rw-r--r--tests/proxy.conf1
-rw-r--r--tests/var-include.conf1
15 files changed, 6 insertions, 34 deletions
diff --git a/tests/404-handler.conf b/tests/404-handler.conf
index 65f2e5ee..f1cd28eb 100644
--- a/tests/404-handler.conf
+++ b/tests/404-handler.conf
@@ -3,7 +3,6 @@ debug.log-response-header = "enable"
debug.log-request-header = "enable"
server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/"
-server.pid-file = env.SRCDIR + "/tmp/lighttpd/lighttpd.pid"
## bind to port (default: 80)
server.port = 2048
diff --git a/tests/LightyTest.pm b/tests/LightyTest.pm
index 0d2d05ee..8d814dec 100755
--- a/tests/LightyTest.pm
+++ b/tests/LightyTest.pm
@@ -42,8 +42,6 @@ sub new {
$self->{MODULES_PATH} = $self->{BASEDIR}.'/build';
}
$self->{LIGHTTPD_PATH} = $self->{BINDIR}.'/lighttpd';
- $self->{LIGHTTPD_PIDFILE} = $self->{TESTDIR}.'/tmp/lighttpd/lighttpd.pid';
- $self->{PIDOF_PIDFILE} = $self->{TESTDIR}.'/tmp/lighttpd/pidof.pid';
$self->{PORT} = 2048;
my ($name, $aliases, $addrtype, $net) = gethostbyaddr(inet_aton("127.0.0.1"), AF_INET);
@@ -72,21 +70,13 @@ sub listening_on {
sub stop_proc {
my $self = shift;
-# open F, $self->{LIGHTTPD_PIDFILE} or return -1;
-# my $pid = <F>;
-# close F;
-
-# if (defined $pid) {
-# kill('TERM',$pid) or return -1;
-# select(undef, undef, undef, 0.5);
-# }
-
my $pid = $self->{LIGHTTPD_PID};
- if (defined $pid) {
+ if (defined $pid && $pid != -1) {
kill('TERM', $pid) or return -1;
return -1 if ($pid != waitpid($pid, 0));
} else {
- diag("Nothing to kill\n");
+ diag("Process not started, nothing to stop");
+ return -1;
}
return 0;
@@ -120,7 +110,6 @@ sub start_proc {
$ENV{'SRCDIR'} = $self->{BASEDIR}.'/tests';
$ENV{'PORT'} = $self->{PORT};
- unlink($self->{LIGHTTPD_PIDFILE});
my $cmdline = $self->{LIGHTTPD_PATH}." -D -f ".$self->{SRCDIR}."/".$self->{CONFIGFILE}." -m ".$self->{MODULES_PATH};
if (defined $ENV{"TRACEME"} && $ENV{"TRACEME"} eq 'strace') {
$cmdline = "strace -tt -s 512 -o strace ".$cmdline;
@@ -140,9 +129,6 @@ sub start_proc {
if ($child == 0) {
exec $cmdline or die($?);
}
-# system($cmdline) == 0 or die($?);
-
- unlink($self->{TESTDIR}."/tmp/cfg.file");
if (0 != $self->wait_for_port_with_proc($self->{PORT}, $child)) {
diag(sprintf('The process %i is not up', $child));
@@ -227,8 +213,9 @@ sub handle_http {
(my $h = $1) =~ tr/[A-Z]/[a-z]/;
if (defined $resp_hdr{$h}) {
- diag(sprintf("header '%s' is duplicated: '%s' and '%s'\n",
- $h, $resp_hdr{$h}, $2));
+# diag(sprintf("header '%s' is duplicated: '%s' and '%s'\n",
+# $h, $resp_hdr{$h}, $2));
+ $resp_hdr{$h} .= ', '.$2;
} else {
$resp_hdr{$h} = $2;
}
diff --git a/tests/bug-06.conf b/tests/bug-06.conf
index 3cc75259..cf6abb4e 100644
--- a/tests/bug-06.conf
+++ b/tests/bug-06.conf
@@ -1,5 +1,4 @@
server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/"
-server.pid-file = env.SRCDIR + "/tmp/lighttpd/lighttpd.pid"
## bind to port (default: 80)
server.port = 2048
diff --git a/tests/bug-12.conf b/tests/bug-12.conf
index cd72bf88..5394d8c7 100644
--- a/tests/bug-12.conf
+++ b/tests/bug-12.conf
@@ -1,5 +1,4 @@
server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/"
-server.pid-file = env.SRCDIR + "/tmp/lighttpd/lighttpd.pid"
## bind to port (default: 80)
server.port = 2048
diff --git a/tests/condition.conf b/tests/condition.conf
index 63b8fadb..900b9c46 100644
--- a/tests/condition.conf
+++ b/tests/condition.conf
@@ -3,7 +3,6 @@ debug.log-request-handling = "enable"
debug.log-condition-handling = "enable"
server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/"
-server.pid-file = env.SRCDIR + "/tmp/lighttpd/lighttpd.pid"
## bind to port (default: 80)
server.port = 2048
diff --git a/tests/fastcgi-10.conf b/tests/fastcgi-10.conf
index c13d5649..f313b415 100644
--- a/tests/fastcgi-10.conf
+++ b/tests/fastcgi-10.conf
@@ -1,5 +1,4 @@
server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/"
-server.pid-file = env.SRCDIR + "/tmp/lighttpd/lighttpd.pid"
## bind to port (default: 80)
server.port = 2048
diff --git a/tests/fastcgi-13.conf b/tests/fastcgi-13.conf
index 6ef0386e..72c5b9f9 100644
--- a/tests/fastcgi-13.conf
+++ b/tests/fastcgi-13.conf
@@ -1,5 +1,4 @@
server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/"
-server.pid-file = env.SRCDIR + "/tmp/lighttpd/lighttpd.pid"
debug.log-request-header = "enable"
debug.log-response-header = "enable"
diff --git a/tests/fastcgi-auth.conf b/tests/fastcgi-auth.conf
index 00b00609..76b480f1 100644
--- a/tests/fastcgi-auth.conf
+++ b/tests/fastcgi-auth.conf
@@ -1,5 +1,4 @@
server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/"
-server.pid-file = env.SRCDIR + "/tmp/lighttpd/lighttpd.pid"
debug.log-request-header = "enable"
debug.log-response-header = "enable"
diff --git a/tests/fastcgi-responder.conf b/tests/fastcgi-responder.conf
index be5a97e2..6a782423 100644
--- a/tests/fastcgi-responder.conf
+++ b/tests/fastcgi-responder.conf
@@ -1,5 +1,4 @@
server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/"
-server.pid-file = env.SRCDIR + "/tmp/lighttpd/lighttpd.pid"
#debug.log-request-header = "enable"
#debug.log-response-header = "enable"
diff --git a/tests/lighttpd.conf b/tests/lighttpd.conf
index 71a37fee..492d9c0b 100644
--- a/tests/lighttpd.conf
+++ b/tests/lighttpd.conf
@@ -3,7 +3,6 @@ debug.log-request-header = "enable"
debug.log-response-header = "enable"
debug.log-condition-handling = "enable"
server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/"
-server.pid-file = env.SRCDIR + "/tmp/lighttpd/lighttpd.pid"
## 64 Mbyte ... nice limit
server.max-request-size = 65000
diff --git a/tests/lowercase.conf b/tests/lowercase.conf
index 557a703d..ae910058 100644
--- a/tests/lowercase.conf
+++ b/tests/lowercase.conf
@@ -1,5 +1,4 @@
server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/"
-server.pid-file = env.SRCDIR + "/tmp/lighttpd/lighttpd.pid"
## bind to port (default: 80)
server.port = 2048
diff --git a/tests/mod-extforward.conf b/tests/mod-extforward.conf
index 260805a9..4a7a5fe6 100644
--- a/tests/mod-extforward.conf
+++ b/tests/mod-extforward.conf
@@ -3,7 +3,6 @@ debug.log-response-header = "disable"
debug.log-request-header = "disable"
server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/"
-server.pid-file = env.SRCDIR + "/tmp/lighttpd/lighttpd.pid"
## bind to port (default: 80)
server.port = 2048
diff --git a/tests/mod-proxy.t b/tests/mod-proxy.t
index b43c4657..402eeee0 100755
--- a/tests/mod-proxy.t
+++ b/tests/mod-proxy.t
@@ -22,11 +22,9 @@ my $t;
$tf_real->{PORT} = 2048;
$tf_real->{CONFIGFILE} = 'lighttpd.conf';
-$tf_real->{LIGHTTPD_PIDFILE} = $tf_real->{TESTDIR}.'/tmp/lighttpd/lighttpd.pid';
$tf_proxy->{PORT} = 2050;
$tf_proxy->{CONFIGFILE} = 'proxy.conf';
-$tf_proxy->{LIGHTTPD_PIDFILE} = $tf_proxy->{TESTDIR}.'/tmp/lighttpd/lighttpd-proxy.pid';
ok($tf_real->start_proc == 0, "Starting lighttpd") or die();
diff --git a/tests/proxy.conf b/tests/proxy.conf
index 2d1ab0d3..2071f838 100644
--- a/tests/proxy.conf
+++ b/tests/proxy.conf
@@ -1,5 +1,4 @@
server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/"
-server.pid-file = env.SRCDIR + "/tmp/lighttpd/lighttpd-proxy.pid"
## bind to port (default: 80)
server.port = 2050
diff --git a/tests/var-include.conf b/tests/var-include.conf
index 4cf6113c..6b42bb01 100644
--- a/tests/var-include.conf
+++ b/tests/var-include.conf
@@ -3,7 +3,6 @@ debug.log-request-handling = "enable"
debug.log-condition-handling = "enable"
server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/"
-server.pid-file = env.SRCDIR + "/tmp/lighttpd/lighttpd.pid"
## bind to port (default: 80)
server.port = 2048
View Lorry Controller Status