diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-06-26 19:29:43 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:09:32 -0500 |
| commit | 993012bd2adaaa81d06341cdc36fccc919b0a91b (patch) | |
| tree | 9d977731cc595249b8916ea139889663e826043c /source4/script/tests | |
| parent | 3fc105b106c1ebf0ab097b9cf150dc211be01d92 (diff) | |
| download | samba-993012bd2adaaa81d06341cdc36fccc919b0a91b.tar.gz samba-993012bd2adaaa81d06341cdc36fccc919b0a91b.tar.bz2 samba-993012bd2adaaa81d06341cdc36fccc919b0a91b.zip | |
r16525: Move selftest-specific code back to selftest.
(This used to be commit e659d772480ef9acb58f899f25f09f917cece30f)
Diffstat (limited to 'source4/script/tests')
| -rwxr-xr-x | source4/script/tests/mktestsetup.sh | 5 | ||||
| -rwxr-xr-x | source4/script/tests/selftest.sh | 8 |
2 files changed, 6 insertions, 7 deletions
diff --git a/source4/script/tests/mktestsetup.sh b/source4/script/tests/mktestsetup.sh index 104eaea85e..9244bde796 100755 --- a/source4/script/tests/mktestsetup.sh +++ b/source4/script/tests/mktestsetup.sh @@ -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 diff --git a/source4/script/tests/selftest.sh b/source4/script/tests/selftest.sh index 7c4747b4d1..d6023e5bd7 100755 --- a/source4/script/tests/selftest.sh +++ b/source4/script/tests/selftest.sh @@ -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" |