Use root-dse to verify schema files

diff --git a/tests/data/slapd-master.conf b/tests/data/slapd-master.conf
index 7c0cc687dc901ec5879e672f26b0acea334609aa..a9ab4d3156c25556d832b7096c1429de76a1ad32 100644 (file)
--- a/tests/data/slapd-master.conf
+++ b/tests/data/slapd-master.conf
@@ -8,7 +8,6 @@ ucdata-path     ./ucdata
 include ./schema/core.schema
 include ./schema/cosine.schema
 include ./schema/inetorgperson.schema
-#include ./schema/nis.schema
 schemacheck    on
 pidfile     ./test-db/slapd.pid
 argsfile    ./test-db/slapd.args

diff --git a/tests/data/slapd-schema.conf b/tests/data/slapd-schema.conf
new file mode 100644 (file)
index 0000000..2972746
--- /dev/null
+++ b/tests/data/slapd-schema.conf
@@ -0,0 +1,39 @@
+# $OpenLDAP$
+#
+# stand-alone slapd config -- for testing
+#      with indexing
+#
+ucdata-path    ./ucdata
+#include               ./data/slapd.at.conf
+#include               ./data/slapd.oc.conf
+#
+include ./schema/core.schema
+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/nadf.schema
+include ./schema/nis.schema
+include ./schema/openldap.schema
+#
+schemacheck    on
+pidfile     ./test-db/slapd.pid
+argsfile    ./test-db/slapd.args
+
+#######################################################################
+# ldbm database definitions
+#######################################################################
+
+database       ldbm
+suffix         "o=University of Michigan, c=US"
+directory      ./test-db
+rootdn         "cn=Manager, o=University of Michigan, c=US"
+rootpw         secret
+index          objectclass     eq
+index          uid     pres,eq,sub
+index          cn,sn   pres,eq,sub,subany
+dbnosync
+dbnolocking

diff --git a/tests/scripts/defines.sh b/tests/scripts/defines.sh
index 6a513fa7a5cd80e8acc10acf9dea9a3672f73dd8..42ae7352c9705eb08e94813dcd76b43fe91e9d3c 100755 (executable)
--- a/tests/scripts/defines.sh
+++ b/tests/scripts/defines.sh
@@ -11,6 +11,7 @@ if test "$BACKEND" = "bdb2" ; then
        MASTERCONF=$DATADIR/slapd-bdb2-repl-master.conf
        SLAVECONF=$DATADIR/slapd-bdb2-repl-slave.conf
        REFSLAVECONF=$DATADIR/slapd-bdb2-ref-slave.conf
+       SCHEMACONF=$DATADIR/slapd-bdb2-schema.conf
        TIMING="-t"
 else
        CONF=$DATADIR/slapd.conf
@@ -20,6 +21,7 @@ else
        MASTERCONF=$DATADIR/slapd-repl-master.conf
        SLAVECONF=$DATADIR/slapd-repl-slave.conf
        REFSLAVECONF=$DATADIR/slapd-ref-slave.conf
+       SCHEMACONF=$DATADIR/slapd-schema.conf
 fi
 
 TOOLARGS="-x $LDAP_TOOLARGS"

diff --git a/tests/scripts/test000-rootdse b/tests/scripts/test000-rootdse
index 3f7a0e89fa3dfa952661be1133dbb3a95c01c2eb..aedbce88593b128ef805e8237493820ea17874a2 100755 (executable)
--- a/tests/scripts/test000-rootdse
+++ b/tests/scripts/test000-rootdse
@@ -21,7 +21,7 @@ echo "Cleaning up in $DBDIR..."
 rm -f $DBDIR/[!C]*
 
 echo "Starting slapd on TCP/IP port $PORT..."
-$SLAPD -f $CONF -h $MASTERURI -d $LVL $TIMING > $MASTERLOG 2>&1 &
+$SLAPD -f $SCHEMACONF -h $MASTERURI -d $LVL $TIMING > $MASTERLOG 2>&1 &
 PID=$!
 
 echo "Using ldapsearch to retrieve all the entries..."