Move S3 specific parameters to S3 conf file in make test.

diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index 0f1ca32e4a11fa839b736f8b4a0f5f01f4a03ab3..94621841f55c1f1e60d7bab570f9dfd4c14e1cef 100755 (executable)
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -170,8 +170,6 @@ cat >$COMMONCONFFILE<<EOF
        private dir = $PRIVATEDIR
        pid directory = $PIDDIR
        lock directory = $LOCKDIR
-       state directory = $LOCKDIR
-       cache directory = $LOCKDIR
        log file = $LOGDIR/log.%m
        log level = 0
 
@@ -207,6 +205,9 @@ cat >$SERVERCONFFILE<<EOF
        panic action = $SCRIPTDIR/gdb_backtrace %d %\$(MAKE_TEST_BINARY)
        include = $COMMONCONFFILE
 
+       state directory = $LOCKDIR
+       cache directory = $LOCKDIR
+
        passdb backend = tdbsam
 
        domain master = yes