diff options
| author | Jan Kneschke <jan@kneschke.de> | 2005-08-29 14:12:31 +0000 |
|---|---|---|
| committer | Jan Kneschke <jan@kneschke.de> | 2005-08-29 14:12:31 +0000 |
| commit | b14d500a9e9b80a5aa500552ba775f8ebdd970c9 (patch) | |
| tree | 1b272476e9782b0de59adad3e6e54ff7042262bd /tests/LightyTest.pm | |
| parent | 15dc40cd364d6cf5a25b0e5db8a118e768a42faf (diff) | |
| download | lighttpd-git-b14d500a9e9b80a5aa500552ba775f8ebdd970c9.tar.gz | |
do a long wait if the lighttpd isn't starting up fast enoughlighttpd-1.4.2
git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-merge-1.4.x@647 152afb58-edef-0310-8abb-c4023f1b3aa9
Diffstat (limited to 'tests/LightyTest.pm')
| -rwxr-xr-x | tests/LightyTest.pm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/LightyTest.pm b/tests/LightyTest.pm index 23a9eaa2..e619051b 100755 --- a/tests/LightyTest.pm +++ b/tests/LightyTest.pm @@ -84,14 +84,14 @@ sub start_proc { unlink($self->{LIGHTTPD_PIDFILE}); if (1) { system($self->{LIGHTTPD_PATH}." -f ".$self->{TESTDIR}."/tmp/cfg.file -m ".$self->{BASEDIR}."/src/.libs"); - select(undef, undef, undef, 0.1); } 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->{BASEDIR}."/src/.libs &"); - select(undef, undef, undef, 2); } - - # sleep(1); + select(undef, undef, undef, 0.1); + if (not -e $self->{LIGHTTPD_PIDFILE} or 0 == kill 0, `cat $self->{LIGHTTPD_PIDFILE}`) { + select(undef, undef, undef, 2); + } unlink($self->{TESTDIR}."/tmp/cfg.file"); |