From: Howard Chu <hyc@openldap.org>
Date: Thu, 13 May 2004 00:26:10 +0000 (+0000)
Subject: ITS#3125 load back-monitor if it's a module
X-Git-Tag: OPENDLAP_REL_ENG_2_2_MP~386
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5f245561a738aeb106d96fc5bf97268bdb098edb;p=openldap

ITS#3125 load back-monitor if it's a module
---

diff --git a/tests/data/slapd-schema.conf b/tests/data/slapd-schema.conf
index 008dc2f347..69e3811a12 100644
--- a/tests/data/slapd-schema.conf
+++ b/tests/data/slapd-schema.conf
@@ -35,6 +35,8 @@ rootdse 	./testdata/rootdse.ldif
 #mod#modulepath	../servers/slapd/back-@BACKEND@/
 #mod#moduleload	back_@BACKEND@.la
 
+#monitormod#moduleload ../servers/slapd/back-monitor/back_monitor.la
+
 #######################################################################
 # ldbm database definitions
 #######################################################################
diff --git a/tests/scripts/conf.sh b/tests/scripts/conf.sh
index ebb1c7bad5..bb20b9cd1f 100755
--- a/tests/scripts/conf.sh
+++ b/tests/scripts/conf.sh
@@ -12,8 +12,13 @@
 ## A copy of this license is available in the file LICENSE in the
 ## top-level directory of the distribution or, alternatively, at
 ## <http://www.OpenLDAP.org/license.html>.
-if [ x"$MONITORDB" = x"yes" ] ; then
+if [ x"$MONITORDB" = x"yes" -o x"$MONITORDB" = xmod ] ; then
 	MON=monitor
+	if [ $MONITORDB = mod ] ; then
+		MONMOD=monitormod
+	else
+		MONMOD=nomod
+	fi
 else
 	MON=nomonitor
 fi
@@ -26,5 +31,6 @@ sed -e "s/@BACKEND@/${BACKEND}/"			\
 	-e "s/^#${AC_refint}#//"			\
 	-e "s/^#${AC_unique}#//"			\
 	-e "s/^#${MON}#//"				\
+	-e "s/^#${MONMOD}#//"				\
 	-e "s/@CACHETTL@/${CACHETTL}/"			\
 	-e "s/@ENTRY_LIMIT@/${CACHE_ENTRY_LIMIT}/"