Add infrastructure for reindex testing

diff --git a/tests/data/slapd-master.conf b/tests/data/slapd-master.conf
index f5dd0691ed308a99de2c93a2b1a46d137e0fdd88..f3d7e044b101ed1af73184cc06216602a921ec8f 100644 (file)
--- a/tests/data/slapd-master.conf
+++ b/tests/data/slapd-master.conf
@@ -21,7 +21,3 @@ 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          cn,sn,uid       pres,eq,sub
-dbnosync
-dbnolocking

diff --git a/tests/data/slapd.conf b/tests/data/slapd.conf
new file mode 100644 (file)
index 0000000..23228a8
--- /dev/null
+++ b/tests/data/slapd.conf
@@ -0,0 +1,28 @@
+# $OpenLDAP$
+#
+# stand-alone slapd config -- for testing
+#      with indexing
+#
+#include               ./data/slapd.at.conf
+#include               ./data/slapd.oc.conf
+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
+
+#######################################################################
+# 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          cn,sn,uid       pres,eq,sub
+dbnosync
+dbnolocking

diff --git a/tests/scripts/defines.sh b/tests/scripts/defines.sh
index 649fb30e5c2b38c2bdd552e48609fc90429997d8..6a513fa7a5cd80e8acc10acf9dea9a3672f73dd8 100755 (executable)
--- a/tests/scripts/defines.sh
+++ b/tests/scripts/defines.sh
@@ -13,7 +13,8 @@ if test "$BACKEND" = "bdb2" ; then
        REFSLAVECONF=$DATADIR/slapd-bdb2-ref-slave.conf
        TIMING="-t"
 else
-       CONF=$DATADIR/slapd-master.conf
+       CONF=$DATADIR/slapd.conf
+       MCONF=$DATADIR/slapd-master.conf
        PWCONF=$DATADIR/slapd-pw.conf
        ACLCONF=$DATADIR/slapd-acl.conf
        MASTERCONF=$DATADIR/slapd-repl-master.conf

diff --git a/tests/scripts/test003-search b/tests/scripts/test003-search
index 5b82c32c0d12368d9e072e1e3e993d7ccac99d6f..ce868f9cddfcdf06bdf83da10d8a457a768050d3 100755 (executable)
--- a/tests/scripts/test003-search
+++ b/tests/scripts/test003-search
@@ -18,6 +18,7 @@ echo "Cleaning up in $DBDIR..."
 rm -f $DBDIR/[!C]*
 
 echo "Running slapadd to build slapd database..."
+# $SLAPADD -f $MCONF -l $LDIF
 $SLAPADD -f $CONF -l $LDIF
 RC=$?
 if test $RC != 0 ; then
@@ -25,6 +26,14 @@ if test $RC != 0 ; then
        exit $RC
 fi
 
+# echo "Running slapindex to index slapd database..."
+# $SLAPINDEX -f $CONF
+# RC=$?
+# if test $RC != 0 ; then
+#      echo "slapindex failed ($RC)!"
+#      exit $RC
+# fi
+
 echo "Starting slapd on TCP/IP port $PORT..."
 $SLAPD -f $CONF -h $MASTERURI -d $LVL $TIMING > $MASTERLOG 2>&1 &
 PID=$!