diff options
Diffstat (limited to 'source4/script/tests/test_functions.sh')
| -rwxr-xr-x | source4/script/tests/test_functions.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source4/script/tests/test_functions.sh b/source4/script/tests/test_functions.sh index 44d55c99c2..5b9c63a9eb 100755 --- a/source4/script/tests/test_functions.sh +++ b/source4/script/tests/test_functions.sh @@ -19,11 +19,10 @@ smbd_check_or_start() { echo -n "STARTING SMBD..." (( - runtime=2700 - if [ -n "$SMBD_VALGRIND" ]; then - runtime=7200 + if [ -z "$SMBD_MAXTIME" ]; then + SMBD_MAXTIME=2700 fi - $SMBD_VALGRIND $SRCDIR/bin/smbd --maximum-runtime=$runtime -d1 -s $CONFFILE -M single -i < $SMBD_TEST_FIFO > $SMBD_TEST_LOG 2>&1; + $SMBD_VALGRIND $SRCDIR/bin/smbd --maximum-runtime=$SMBD_MAXTIME -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 |