Place the arg and pid files into the test-* directories.

diff --git a/tests/data/slapd-acl.conf b/tests/data/slapd-acl.conf
index 6e86cdb1c8932edd46453bd966e87e5ec1e2c683..80dd2b65940aa7c3d1699a1e3d49a8b8fd4ea756 100644 (file)
--- a/tests/data/slapd-acl.conf
+++ b/tests/data/slapd-acl.conf
@@ -4,8 +4,8 @@
 include                ./data/slapd.at.conf
 include                ./data/slapd.oc.conf
 schemacheck    off
-pidfile     ./var/slapd-acl.pid
-argsfile    ./var/slapd-acl.args
+pidfile     ./test-db/slapd.pid
+argsfile    ./test-db/slapd.args
 
 #######################################################################
 # ldbm database definitions

diff --git a/tests/data/slapd-master.conf b/tests/data/slapd-master.conf
index 87f806e42d4cfd9597a07597764ac453c47c6fb2..8d642c56d47a80b0318e2c549078f61c5963a0f0 100644 (file)
--- a/tests/data/slapd-master.conf
+++ b/tests/data/slapd-master.conf
@@ -4,8 +4,8 @@
 include                ./data/slapd.at.conf
 include                ./data/slapd.oc.conf
 schemacheck    on
-pidfile     ./var/slapd-master.pid
-argsfile    ./var/slapd-master.args
+pidfile     ./test-db/slapd.pid
+argsfile    ./test-db/slapd.args
 
 #######################################################################
 # ldbm database definitions

diff --git a/tests/data/slapd-repl-master.conf b/tests/data/slapd-repl-master.conf
index 3e5b1cc6ebc5a7303dde090d81a8919cd44c2c9e..9bc24b482e8ebae08581511ba76d5c6ac7b6a789 100644 (file)
--- a/tests/data/slapd-repl-master.conf
+++ b/tests/data/slapd-repl-master.conf
@@ -4,8 +4,8 @@
 include                ./data/slapd.at.conf
 include                ./data/slapd.oc.conf
 schemacheck    off
-pidfile     ./var/slapd-repl-master.pid
-argsfile    ./var/slapd-repl-master.args
+pidfile     ./test-db/slapd.pid
+argsfile    ./test-db/slapd.args
 
 #######################################################################
 # ldbm database definitions

diff --git a/tests/data/slapd-repl-slave.conf b/tests/data/slapd-repl-slave.conf
index cc44dd1c01f797dc0b59eec9176208dfeab10f85..66926c6c411ad747c354f7af91fe232bb82a509b 100644 (file)
--- a/tests/data/slapd-repl-slave.conf
+++ b/tests/data/slapd-repl-slave.conf
@@ -4,8 +4,8 @@
 include                ./data/slapd.at.conf
 include                ./data/slapd.oc.conf
 schemacheck    off
-pidfile     ./var/slapd-repl-slave.pid
-argsfile    ./var/slapd-repl-slave.args
+pidfile     ./test-repl/slapd.pid
+argsfile    ./test-repl/slapd.args
 
 #######################################################################
 # ldbm database definitions