diff options
author | Stefan Bühler <stbuehler@web.de> | 2015-02-08 19:10:41 +0000 |
---|---|---|
committer | Stefan Bühler <stbuehler@web.de> | 2015-02-08 19:10:41 +0000 |
commit | adfa06de996944b495b878540464dd6e74563052 (patch) | |
tree | 61d2bac89641e959ee349d3012ee56fcc032078e /tests/LightyTest.pm | |
parent | 4365bdbebe4542efc28ce6a79e1341870abc24d3 (diff) | |
download | lighttpd-git-adfa06de996944b495b878540464dd6e74563052.tar.gz |
[tests] improve valgrind and strace TRACEME, disable condition logging in normal configs
- condition logging is way too noisy and rarely useful
- increate timeout to wait for port bind; if the process dies we fail
early anyway
From: Stefan Bühler <stbuehler@web.de>
git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2978 152afb58-edef-0310-8abb-c4023f1b3aa9
Diffstat (limited to 'tests/LightyTest.pm')
-rwxr-xr-x | tests/LightyTest.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/LightyTest.pm b/tests/LightyTest.pm index b92af876..36029dc8 100755 --- a/tests/LightyTest.pm +++ b/tests/LightyTest.pm @@ -87,7 +87,7 @@ sub wait_for_port_with_proc { my $self = shift; my $port = shift; my $child = shift; - my $timeout = 5*10; # 5 secs, select waits 0.1 s + my $timeout = 10*10; # 10 secs (valgrind might take a while), select waits 0.1 s while (0 == $self->listening_on($port)) { select(undef, undef, undef, 0.1); @@ -125,13 +125,13 @@ sub start_proc { my @cmdline = ($self->{LIGHTTPD_PATH}, "-D", "-f", $self->{SRCDIR}."/".$self->{CONFIGFILE}, "-m", $self->{MODULES_PATH}); if (defined $ENV{"TRACEME"} && $ENV{"TRACEME"} eq 'strace') { - @cmdline = (qw(strace -tt -s 512 -o strace), @cmdline); + @cmdline = (qw(strace -tt -s 4096 -o strace -f -v), @cmdline); } elsif (defined $ENV{"TRACEME"} && $ENV{"TRACEME"} eq 'truss') { @cmdline = (qw(truss -a -l -w all -v all -o strace), @cmdline); } elsif (defined $ENV{"TRACEME"} && $ENV{"TRACEME"} eq 'gdb') { @cmdline = ('gdb', '--batch', '--ex', 'run', '--ex', 'bt full', '--args', @cmdline); } elsif (defined $ENV{"TRACEME"} && $ENV{"TRACEME"} eq 'valgrind') { - @cmdline = (qw(valgrind --tool=memcheck --show-reachable=yes --leak-check=yes --log-file=valgrind), @cmdline); + @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 ); my $child = fork(); |