sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-26 10:04:02 +03:00
Code

r11659: allow the max runtime for smbtorture and smbd to be controlled on a

Browse Source 
per-host basis in the build farm
(This used to be commit c8185fe414ef686a52327f420ee81ce09b983c3c)
This commit is contained in:
Andrew Tridgell 2005-11-11 00:50:40 +00:00 committed by Gerald (Jerry) Carter
parent 92b9b83b70
commit 5358763b41
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source4/script/tests/selftest.sh
View File

@ -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`

7
source4/script/tests/test_functions.sh
View File

@ -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