summaryrefslogtreecommitdiff
path: root/source4/torture
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-06-09 08:58:12 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:17:52 -0500
commit34f48e0e095dd6e3459984a4131b433177319abb (patch)
tree09b7e9b08e718684ab414260193df95f43002d9f /source4/torture
parent09753bf20a2d5c7c0b101e05f2178ca1d2e52283 (diff)
downloadsamba-34f48e0e095dd6e3459984a4131b433177319abb.tar.gz
samba-34f48e0e095dd6e3459984a4131b433177319abb.tar.bz2
samba-34f48e0e095dd6e3459984a4131b433177319abb.zip
r7431: this should fix the bug that mkaplan and I noticed which is that
BENCH-NBENCH sometimes incorrectly reports that it failed. (This used to be commit 167c29bec6f28e58b5d36325b4285748a47adc58)
Diffstat (limited to 'source4/torture')
-rw-r--r--source4/torture/nbench/nbench.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/source4/torture/nbench/nbench.c b/source4/torture/nbench/nbench.c
index 8e19461b95..9b3c9cdb5a 100644
--- a/source4/torture/nbench/nbench.c
+++ b/source4/torture/nbench/nbench.c
@@ -198,6 +198,14 @@ BOOL torture_nbench(void)
printf("Running for %d seconds with load '%s' and warmup %d secs\n",
timelimit, loadfile, warmup);
+ /* we need to reset SIGCHLD here as the name resolution
+ library may have changed it. We rely on correct signals
+ from childs in the main torture code which reaps
+ children. This is why smbtorture BENCH-NBENCH was sometimes
+ failing */
+ signal(SIGCHLD, SIG_DFL);
+
+
signal(SIGALRM, nb_alarm);
alarm(1);
torture_create_procs(run_netbench, &correct);