diff options
author | Andrew Tridgell <tridge@samba.org> | 2005-11-11 00:50:40 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:46:08 -0500 |
commit | 5358763b41f6720e5e9c31f50e699308e845f52b (patch) | |
tree | e9b73b18a6ec4c8861f9346f1ca271acacb85763 /source4/script/tests/test_functions.sh | |
parent | 92b9b83b70aef5ec77f3944f495205c107c6921a (diff) | |
download | samba-5358763b41f6720e5e9c31f50e699308e845f52b.tar.gz samba-5358763b41f6720e5e9c31f50e699308e845f52b.tar.bz2 samba-5358763b41f6720e5e9c31f50e699308e845f52b.zip |
r11659: allow the max runtime for smbtorture and smbd to be controlled on a
per-host basis in the build farm
(This used to be commit c8185fe414ef686a52327f420ee81ce09b983c3c)
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 |