summaryrefslogtreecommitdiff
path: root/tests/LightyTest.pm
diff options
context:
space:
mode:
authorJan Kneschke <jan@kneschke.de>2005-08-08 13:48:33 +0000
committerJan Kneschke <jan@kneschke.de>2005-08-08 13:48:33 +0000
commit8073d5fe9f720a0564dbced1fdef187f5c19ffa3 (patch)
treea8191be15dd3a92d7f91d51230f2071f70bb418d /tests/LightyTest.pm
parent4d6933c0c19ac27330b5a1e7367a24834fb18f79 (diff)
downloadlighttpd-git-8073d5fe9f720a0564dbced1fdef187f5c19ffa3.tar.gz
added nested conditionals (merged [298])
git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-merge-1.4.x@519 152afb58-edef-0310-8abb-c4023f1b3aa9
Diffstat (limited to 'tests/LightyTest.pm')
-rwxr-xr-xtests/LightyTest.pm11
1 files changed, 7 insertions, 4 deletions
diff --git a/tests/LightyTest.pm b/tests/LightyTest.pm
index 6ecd1e87..a95ca06d 100755
--- a/tests/LightyTest.pm
+++ b/tests/LightyTest.pm
@@ -69,11 +69,14 @@ sub start_proc {
system("cat ".$self->{SRCDIR}."/".$self->{CONFIGFILE}.' | perl -pe "s#\@SRCDIR\@#'.$pwd.'/'.$self->{BASEDIR}.'/tests/#" > /tmp/cfg.file');
unlink($self->{LIGHTTPD_PIDFILE});
- system($self->{LIGHTTPD_PATH}." -f /tmp/cfg.file");
- # system("valgrind --tool=memcheck --show-reachable=yes --leak-check=yes --logfile=foo ".$lighttpd_path." -D -f /tmp/cfg.file &");
- #
+ if (1) {
+ system($self->{LIGHTTPD_PATH}." -f /tmp/cfg.file");
+ select(undef, undef, undef, 0.1);
+ } else {
+ system("valgrind --tool=memcheck --show-reachable=yes --leak-check=yes --logfile=foo ".$self->{LIGHTTPD_PATH}." -D -f /tmp/cfg.file &");
+ select(undef, undef, undef, 1);
+ }
- select(undef, undef, undef, 0.1);
# sleep(1);