r10643: increase smbd max runtime when using valgrind

(This used to be commit c394a4a602edba49f00252d0376050c0bdc2f6a8)

diff --git a/source4/script/tests/test_functions.sh b/source4/script/tests/test_functions.sh
index ddf81a1610fd01a2b385c578da7120e05d8f45bc..44d55c99c24d5a62e7f863e205ba5ba4b7132d37 100755 (executable)
--- 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