From: Kurt Zeilenga <kurt@openldap.org>
Date: Wed, 26 Jul 2000 18:24:44 +0000 (+0000)
Subject: Add infrastructure for reindex testing
X-Git-Tag: LDBM_PRE_GIANT_RWLOCK~2347
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c49960df72628b213063159a7ca3b775965da50f;p=openldap

Add infrastructure for reindex testing
---

diff --git a/tests/data/slapd-master.conf b/tests/data/slapd-master.conf
index f5dd0691ed..f3d7e044b1 100644
--- 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
index 0000000000..23228a81a8
--- /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 649fb30e5c..6a513fa7a5 100755
--- 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 5b82c32c0d..ce868f9cdd 100755
--- 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=$!