sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-11-08 16:23:49 +03:00
Code Activity

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

Browse Source 
per-host basis in the build farm
This commit is contained in:
Andrew Tridgell
2005-11-11 00:50:40 +00:00
committed by Gerald (Jerry) Carter
parent d677ebf43d
commit c8185fe414
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,6 +21,10 @@ then
exit exit
fi fi
if [ -z "$TORTURE_MAXTIME" ]; then
TORTURE_MAXTIME=300
fi
PREFIX=$1 PREFIX=$1
PREFIX=`echo $PREFIX | sed s+//+/+` PREFIX=`echo $PREFIX | sed s+//+/+`
@@ -168,7 +172,7 @@ smbd_check_or_start
SOCKET_WRAPPER_DEFAULT_IFACE=26 SOCKET_WRAPPER_DEFAULT_IFACE=26
export SOCKET_WRAPPER_DEFAULT_IFACE 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_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 export TORTURE_OPTIONS
START=`date` START=`date`

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

@@ -19,11 +19,10 @@ smbd_check_or_start() {
echo -n "STARTING SMBD..." echo -n "STARTING SMBD..."
(( ((
runtime=2700 if [ -z "$SMBD_MAXTIME" ]; then
if [ -n "$SMBD_VALGRIND" ]; then SMBD_MAXTIME=2700
runtime=7200
fi 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=$?; ret=$?;
rm -f $SMBD_TEST_FIFO; rm -f $SMBD_TEST_FIFO;
if [ -n "$SOCKET_WRAPPER_DIR" -a -d "$SOCKET_WRAPPER_DIR" ]; then if [ -n "$SOCKET_WRAPPER_DIR" -a -d "$SOCKET_WRAPPER_DIR" ]; then