From: Steven Danneman <steven.danneman@isilon.com>
Date: Tue, 27 Jan 2009 21:24:38 +0000 (-0800)
Subject: Move S3 specific parameters to S3 conf file in make test.
X-Git-Tag: samba-4.0.0alpha7~417^2~315
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fffd94b442e143ddd995ba356497dc6c2528ed4b;p=thirdparty%2Fsamba.git

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 0f1ca32e4a1..94621841f55 100755
--- 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