From fffd94b442e143ddd995ba356497dc6c2528ed4b Mon Sep 17 00:00:00 2001
From: Steven Danneman <steven.danneman@isilon.com>
Date: Tue, 27 Jan 2009 13:24:38 -0800
Subject: [PATCH] Move S3 specific parameters to S3 conf file in make test.

---
 source3/script/tests/selftest.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index 0f1ca32e4a11..94621841f55c 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
-- 
2.34.1