svn commit: samba r11659 - in branches/SAMBA_4_0/source/script/tests: .

[tridge at samba.org]

Author: tridge
Date: 2005-11-11 00:50:40 +0000 (Fri, 11 Nov 2005)
New Revision: 11659

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11659

Log:

allow the max runtime for smbtorture and smbd to be controlled on a
per-host basis in the build farm



Modified:
   branches/SAMBA_4_0/source/script/tests/selftest.sh
   branches/SAMBA_4_0/source/script/tests/test_functions.sh


Changeset:
Modified: branches/SAMBA_4_0/source/script/tests/selftest.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/selftest.sh	2005-11-11 00:16:43 UTC (rev 11658)
+++ branches/SAMBA_4_0/source/script/tests/selftest.sh	2005-11-11 00:50:40 UTC (rev 11659)
@@ -21,7 +21,11 @@
 	exit
 fi
 
+if [ -z "$TORTURE_MAXTIME" ]; then
+    TORTURE_MAXTIME=300
+fi
 
+
 PREFIX=$1
 PREFIX=`echo $PREFIX | sed s+//+/+`
 export PREFIX
@@ -168,7 +172,7 @@
 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`

Modified: branches/SAMBA_4_0/source/script/tests/test_functions.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/test_functions.sh	2005-11-11 00:16:43 UTC (rev 11658)
+++ branches/SAMBA_4_0/source/script/tests/test_functions.sh	2005-11-11 00:50:40 UTC (rev 11659)
@@ -19,11 +19,10 @@
 
 		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