First rounded of changes in prep for 2.2.beta3

[openldap] / tests / data / slapd-schema.conf

diff --git a/tests/data/slapd-schema.conf b/tests/data/slapd-schema.conf
index 49392ee588c8b3d48713988cae0e91f9d7552c44..5db0d0edfa85306753afa5672f3c45eb370b1426 100644 (file)
--- a/tests/data/slapd-schema.conf
+++ b/tests/data/slapd-schema.conf
@@ -11,15 +11,18 @@ include ./schema/cosine.schema
 include ./schema/corba.schema
 include ./schema/java.schema
 include ./schema/inetorgperson.schema
-include ./schema/krb5-kdc.schema
 include ./schema/misc.schema
 include ./schema/nis.schema
 include ./schema/openldap.schema
 #
-include ./schema/collective.schema
+pidfile     ./testrun/slapd.1.pid
+argsfile    ./testrun/slapd.1.args
+
 #
-pidfile     ./test-db/slapd.pid
-argsfile    ./test-db/slapd.args
+rootdse        ./testdata/rootdse.ldif
+
+modulepath     ../servers/slapd/back-@BACKEND@/
+@MODULELOAD@
 
 #######################################################################
 # ldbm database definitions
@@ -27,13 +30,13 @@ argsfile    ./test-db/slapd.args
 
 database       @BACKEND@
 suffix         "o=OpenLDAP Project,l=Internet"
-directory      ./test-db
+directory      ./testrun/db.1.a
 #ldbm#index            objectClass eq
 #bdb#index             objectClass eq
 
 #database      @BACKEND@
 #suffix                "dc=example,dc=com"
-#directory     ./test-repl
+#directory     ./testrun/db.1.b
 #index         objectClass eq
 
 #monitor#database monitor