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/selftest.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/selftest.sh')
-rwxr-xr-x | source4/script/tests/selftest.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source4/script/tests/selftest.sh b/source4/script/tests/selftest.sh index 2648e40b03..95f2b3e767 100755 --- a/source4/script/tests/selftest.sh +++ b/source4/script/tests/selftest.sh @@ -21,6 +21,10 @@ then exit fi +if [ -z "$TORTURE_MAXTIME" ]; then + TORTURE_MAXTIME=300 +fi + PREFIX=$1 PREFIX=`echo $PREFIX | sed s+//+/+` @@ -168,7 +172,7 @@ smbd_check_or_start SOCKET_WRAPPER_DEFAULT_IFACE=26 export SOCKET_WRAPPER_DEFAULT_IFACE TORTURE_INTERFACES='127.0.0.26/8,127.0.0.27/8,127.0.0.28/8,127.0.0.29/8,127.0.0.30/8,127.0.0.31/8' -TORTURE_OPTIONS="--maximum-runtime=300 --option=interfaces=$TORTURE_INTERFACES $CONFIGURATION" +TORTURE_OPTIONS="--maximum-runtime=$TORTURE_MAXTIME --option=interfaces=$TORTURE_INTERFACES $CONFIGURATION" export TORTURE_OPTIONS START=`date` |