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

r16525: Move selftest-specific code back to selftest.

Browse Source 
(This used to be commit e659d77248)
This commit is contained in:
Jelmer Vernooij 2006-06-26 19:29:43 +00:00 committed by Gerald (Jerry) Carter
parent 3fc105b106
commit 993012bd2a
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source4/script/tests/mktestsetup.sh
View File

@ -52,11 +52,6 @@ CONFIGURATION="--configfile=$CONFFILE"
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

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

@ -47,6 +47,11 @@ fi
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,9 +62,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.
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"
export TORTURE_OPTIONS
TORTURE_OPTIONS="$TORTURE_OPTIONS --option=target:samba4=yes"
export TORTURE_OPTIONS
if [ x"$RUN_FROM_BUILD_FARM" = x"yes" ];then
TORTURE_OPTIONS="$TORTURE_OPTIONS --option=torture:progress=no"