Browse Source

[tests] Remove pidfile from test system

git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2242 152afb58-edef-0310-8abb-c4023f1b3aa9
svn/tags/lighttpd-1.4.20
Stefan Bühler 14 years ago
parent
commit
cbd40dc44b
  1. 1
      NEWS
  2. 1
      tests/404-handler.conf
  3. 25
      tests/LightyTest.pm
  4. 1
      tests/bug-06.conf
  5. 1
      tests/bug-12.conf
  6. 1
      tests/condition.conf
  7. 1
      tests/fastcgi-10.conf
  8. 1
      tests/fastcgi-13.conf
  9. 1
      tests/fastcgi-auth.conf
  10. 1
      tests/fastcgi-responder.conf
  11. 1
      tests/lighttpd.conf
  12. 1
      tests/lowercase.conf
  13. 1
      tests/mod-extforward.conf
  14. 2
      tests/mod-proxy.t
  15. 1
      tests/proxy.conf
  16. 1
      tests/var-include.conf

1
NEWS

@ -32,6 +32,7 @@ NEWS
* fix bug with IPv6 in mod_evasive (#1579)
* fix scgi HTTP/1.* status parsing (#1638), found by met@uberstats.com
* [tests] fixed system, use foreground daemons and waitpid
* [tests] removed pidfile from test system
- 1.4.19 - 2008-03-10

1
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

25
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;
}

1
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

1
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

1
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

1
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

1
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"

1
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"

1
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"

1
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

1
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

1
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

2
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();

1
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

1
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

Loading…
Cancel
Save