summaryrefslogtreecommitdiff
path: root/source3/torture
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2002-03-28 02:42:25 +0000
committerAndrew Tridgell <tridge@samba.org>2002-03-28 02:42:25 +0000
commitb9d587cf833bb6bc77558415b877bbaf9acc995c (patch)
tree6e3b37518d0a57d043fcb62ab10b37e0020a377f /source3/torture
parent906d3bda2656c7d88cc02940f6d50fd98eb189ed (diff)
downloadsamba-b9d587cf833bb6bc77558415b877bbaf9acc995c.tar.gz
samba-b9d587cf833bb6bc77558415b877bbaf9acc995c.tar.bz2
samba-b9d587cf833bb6bc77558415b877bbaf9acc995c.zip
a dodgy fix for a dodgy race condition in smbtorture child startup
(This used to be commit 30febde783bcacc111f559473dc15baee66db350)
Diffstat (limited to 'source3/torture')
-rw-r--r--source3/torture/torture.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index cdf681ec8c..fc63ac341b 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -3610,7 +3610,7 @@ static double create_procs(BOOL (*fn)(int), BOOL *result)
child_status[i] = getpid();
- while (child_status[i]) msleep(2);
+ while (child_status[i] && end_timer() < 5) msleep(2);
child_status_out[i] = fn(i);
_exit(0);