summaryrefslogtreecommitdiff
path: root/source4/script
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-09-30 04:52:21 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:39:14 -0500
commit6566c9dffeb53f0e9c5fa2435883043c852987fb (patch)
tree485379000aa4237279667834bf5fc6c64dcdadcb /source4/script
parent588abdba90c9abae3c8ecf5eb45764bbc447b229 (diff)
downloadsamba-6566c9dffeb53f0e9c5fa2435883043c852987fb.tar.gz
samba-6566c9dffeb53f0e9c5fa2435883043c852987fb.tar.bz2
samba-6566c9dffeb53f0e9c5fa2435883043c852987fb.zip
r10643: increase smbd max runtime when using valgrind
(This used to be commit c394a4a602edba49f00252d0376050c0bdc2f6a8)
Diffstat (limited to 'source4/script')
-rwxr-xr-xsource4/script/tests/test_functions.sh6
1 files changed, 5 insertions, 1 deletions
diff --git a/source4/script/tests/test_functions.sh b/source4/script/tests/test_functions.sh
index ddf81a1610..44d55c99c2 100755
--- a/source4/script/tests/test_functions.sh
+++ b/source4/script/tests/test_functions.sh
@@ -19,7 +19,11 @@ smbd_check_or_start() {
echo -n "STARTING SMBD..."
((
- $SMBD_VALGRIND $SRCDIR/bin/smbd --maximum-runtime=2700 -d1 -s $CONFFILE -M single -i < $SMBD_TEST_FIFO > $SMBD_TEST_LOG 2>&1;
+ runtime=2700
+ if [ -n "$SMBD_VALGRIND" ]; then
+ runtime=7200
+ fi
+ $SMBD_VALGRIND $SRCDIR/bin/smbd --maximum-runtime=$runtime -d1 -s $CONFFILE -M single -i < $SMBD_TEST_FIFO > $SMBD_TEST_LOG 2>&1;
ret=$?;
rm -f $SMBD_TEST_FIFO;
if [ -n "$SOCKET_WRAPPER_DIR" -a -d "$SOCKET_WRAPPER_DIR" ]; then