Browse Source

[core] allow tests/tmp/bind.conf override (#3137)

optional bind spec override for tests/*.conf,
e.g. for use on platforms w/o socket activation

x-ref:
  "TRACEME environment option in tests broken with LISTEN_PID"
  https://redmine.lighttpd.net/issues/3137
master
Glenn Strauss 4 months ago
parent
commit
93bc7f2695
  1. 43
      tests/LightyTest.pm
  2. 3
      tests/condition.conf
  3. 3
      tests/fastcgi-responder.conf
  4. 3
      tests/lighttpd.conf
  5. 3
      tests/proxy.conf
  6. 3
      tests/scgi-responder.conf

43
tests/LightyTest.pm

@ -195,7 +195,7 @@ sub start_proc {
} elsif (defined $ENV{"TRACEME"} && $ENV{"TRACEME"} eq 'valgrind') {
@cmdline = (qw(valgrind --tool=memcheck --track-origins=yes --show-reachable=yes --leak-check=yes --log-file=valgrind.%p), @cmdline);
}
# diag("\nstarting lighttpd at :".$self->{PORT}.", cmdline: ".@cmdline );
# diag("\nstarting lighttpd at :".$self->{PORT}.", cmdline: @cmdline");
my $child = fork();
if (not defined $child) {
diag("\nFork failed");
@ -203,21 +203,38 @@ sub start_proc {
return -1;
}
if ($child == 0) {
# set up systemd socket activation env vars
$ENV{LISTEN_FDS} = "1";
$ENV{LISTEN_PID} = $$;
if (defined($ENV{"TRACEME"}) && $ENV{"TRACEME"} ne "valgrind") {
$ENV{LISTEN_PID} = "parent:$$"; # lighttpd extension
}
listen($SOCK, 1024) || die "listen: $!";
if (fileno($SOCK) != 3) { # SD_LISTEN_FDS_START 3
require POSIX;
POSIX::dup2(fileno($SOCK), 3) || die "dup2: $!";
if ($^O eq "MSWin32") {
# On platforms where systemd socket activation is not supported
# or inconvenient for testing (i.e. cygwin <-> native Windows exe),
# there is a race condition with close() before server start,
# but port specific port is unlikely to be reused so quickly,
# and the point is to avoid a port which is already in use.
close($SOCK);
my $CONF;
open($CONF,'>',"$ENV{'SRCDIR'}/tmp/bind.conf") || die "open: $!";
print $CONF <<BIND_OVERRIDE;
server.systemd-socket-activation := "disable"
server.bind = "127.0.0.1"
server.port = $ENV{'PORT'}
BIND_OVERRIDE
}
else {
require Fcntl;
fcntl($SOCK, Fcntl::F_SETFD(), 0); # clr FD_CLOEXEC
# set up systemd socket activation env vars
$ENV{LISTEN_FDS} = "1";
$ENV{LISTEN_PID} = $$;
if (defined($ENV{"TRACEME"}) && $ENV{"TRACEME"} ne "valgrind") {
$ENV{LISTEN_PID} = "parent:$$"; # lighttpd extension
}
listen($SOCK, 1024) || die "listen: $!";
if (fileno($SOCK) != 3) { # SD_LISTEN_FDS_START 3
require POSIX;
POSIX::dup2(fileno($SOCK), 3) || die "dup2: $!";
close($SOCK);
}
else {
require Fcntl;
fcntl($SOCK, Fcntl::F_SETFD(), 0); # clr FD_CLOEXEC
}
}
exec @cmdline or die($?);
}

3
tests/condition.conf

@ -2,6 +2,9 @@ debug.log-request-handling = "enable"
debug.log-condition-handling = "enable"
server.systemd-socket-activation = "enable"
# optional bind spec override, e.g. for platforms without socket activation
include env.SRCDIR + "/tmp/bind*.conf"
server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/"
server.errorlog = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.error.log"
server.breakagelog = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.breakage.log"

3
tests/fastcgi-responder.conf

@ -3,6 +3,9 @@ debug.log-response-header = "enable"
debug.log-request-handling = "enable"
server.systemd-socket-activation = "enable"
# optional bind spec override, e.g. for platforms without socket activation
include env.SRCDIR + "/tmp/bind*.conf"
server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/"
server.errorlog = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.error.log"
server.breakagelog = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.breakage.log"

3
tests/lighttpd.conf

@ -7,6 +7,9 @@ debug.log-response-header = "enable"
server.max-request-size = 65000
server.systemd-socket-activation = "enable"
# optional bind spec override, e.g. for platforms without socket activation
include env.SRCDIR + "/tmp/bind*.conf"
server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/"
server.errorlog = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.error.log"
server.breakagelog = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.breakage.log"

3
tests/proxy.conf

@ -1,4 +1,7 @@
server.systemd-socket-activation = "enable"
# optional bind spec override, e.g. for platforms without socket activation
include env.SRCDIR + "/tmp/bind*.conf"
server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/"
server.errorlog = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.error.log"
server.breakagelog = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.breakage.log"

3
tests/scgi-responder.conf

@ -3,6 +3,9 @@
#debug.log-request-handling = "enable"
server.systemd-socket-activation = "enable"
# optional bind spec override, e.g. for platforms without socket activation
include env.SRCDIR + "/tmp/bind*.conf"
server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/"
server.errorlog = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.error.log"
server.breakagelog = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.breakage.log"

Loading…
Cancel
Save