Author: jelmer Date: 2006-06-26 19:29:43 +0000 (Mon, 26 Jun 2006) New Revision: 16525
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=16525 Log: Move selftest-specific code back to selftest. Modified: branches/SAMBA_4_0/source/script/tests/mktestsetup.sh branches/SAMBA_4_0/source/script/tests/selftest.sh Changeset: Modified: branches/SAMBA_4_0/source/script/tests/mktestsetup.sh =================================================================== --- branches/SAMBA_4_0/source/script/tests/mktestsetup.sh 2006-06-26 19:23:21 UTC (rev 16524) +++ branches/SAMBA_4_0/source/script/tests/mktestsetup.sh 2006-06-26 19:29:43 UTC (rev 16525) @@ -52,11 +52,6 @@ export CONFIGURATION export CONFFILE -SMBD_TEST_FIFO="$PREFIX/smbd_test.fifo" -export SMBD_TEST_FIFO -SMBD_TEST_LOG="$PREFIX/smbd_test.log" -export SMBD_TEST_LOG - rm -rf $PREFIX/* mkdir -p $PRIVATEDIR $ETCDIR $PIDDIR $NCALRPCDIR $LOCKDIR $TMPDIR $TLSDIR Modified: branches/SAMBA_4_0/source/script/tests/selftest.sh =================================================================== --- branches/SAMBA_4_0/source/script/tests/selftest.sh 2006-06-26 19:23:21 UTC (rev 16524) +++ branches/SAMBA_4_0/source/script/tests/selftest.sh 2006-06-26 19:29:43 UTC (rev 16525) @@ -47,6 +47,11 @@ incdir=`dirname $0` . $incdir/test_functions.sh +SMBD_TEST_FIFO="$PREFIX/smbd_test.fifo" +export SMBD_TEST_FIFO +SMBD_TEST_LOG="$PREFIX/smbd_test.log" +export SMBD_TEST_LOG + SOCKET_WRAPPER_DEFAULT_IFACE=1 export SOCKET_WRAPPER_DEFAULT_IFACE smbd_check_or_start @@ -57,10 +62,9 @@ TORTURE_OPTIONS="--option=interfaces=$TORTURE_INTERFACES $CONFIGURATION" # ensure any one smbtorture call doesn't run too long TORTURE_OPTIONS="$TORTURE_OPTIONS --maximum-runtime=$TORTURE_MAXTIME" +TORTURE_OPTIONS="$TORTURE_OPTIONS --option=target:samba4=yes" export TORTURE_OPTIONS -TORTURE_OPTIONS="$TORTURE_OPTIONS --option=target:samba4=yes" - if [ x"$RUN_FROM_BUILD_FARM" = x"yes" ];then TORTURE_OPTIONS="$TORTURE_OPTIONS --option=torture:progress=no" fi
