diff options
author | Jan Kneschke <jan@kneschke.de> | 2006-09-21 14:48:46 +0000 |
---|---|---|
committer | Jan Kneschke <jan@kneschke.de> | 2006-09-21 14:48:46 +0000 |
commit | 30d892061eee5444e0e2e64fb5f4e8ec1f325201 (patch) | |
tree | c2e5479efeb2210c3abaccaf8facb87248e33014 /tests/LightyTest.pm | |
parent | 6ae9b8f58e7b82644ecaa763616fd3f7456d7440 (diff) | |
download | lighttpd-git-30d892061eee5444e0e2e64fb5f4e8ec1f325201.tar.gz |
merged [1174] and [1224]
git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.11-ssl-fixes@1331 152afb58-edef-0310-8abb-c4023f1b3aa9
Diffstat (limited to 'tests/LightyTest.pm')
-rwxr-xr-x | tests/LightyTest.pm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tests/LightyTest.pm b/tests/LightyTest.pm index 49d2175b..0426d45e 100755 --- a/tests/LightyTest.pm +++ b/tests/LightyTest.pm @@ -90,10 +90,12 @@ sub start_proc { $ENV{'SRCDIR'} = $self->{BASEDIR}.'/tests'; unlink($self->{LIGHTTPD_PIDFILE}); - if (1) { - system($self->{LIGHTTPD_PATH}." -f ".$self->{SRCDIR}."/".$self->{CONFIGFILE}." -m ".$self->{MODULES_PATH}); + if (defined $ENV{"TRACEME"} && $ENV{"TRACEME"} eq 'strace') { + system("strace -tt -s 512 -o strace ".$self->{LIGHTTPD_PATH}." -D -f ".$self->{SRCDIR}."/".$self->{CONFIGFILE}." -m ".$self->{MODULES_PATH}." &"); + } elsif (defined $ENV{"TRACEME"} && $ENV{"TRACEME"} eq 'valgrind') { + system("valgrind --tool=memcheck --show-reachable=yes --leak-check=yes --log-file=valgrind ".$self->{LIGHTTPD_PATH}." -D -f ".$self->{SRCDIR}."/".$self->{CONFIGFILE}." -m ".$self->{MODULES_PATH}." &"); } else { - system("valgrind --tool=memcheck --show-reachable=yes --leak-check=yes --logfile=foo ".$self->{LIGHTTPD_PATH}." -D -f ".$self->{TESTDIR}."/tmp/cfg.file -m ".$self->{MODULES_PATH}." &"); + system($self->{LIGHTTPD_PATH}." -f ".$self->{SRCDIR}."/".$self->{CONFIGFILE}." -m ".$self->{MODULES_PATH}); } select(undef, undef, undef, 0.1); |