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 008dc2f347438cfc7f7065ee462c79a3f5e87a16..69e3811a1272408ab5064cc30ffa509f93140b89 100644 (file)
--- 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 ebb1c7bad5789f94a3a608e0532a003a80b0d580..bb20b9cd1f4dfcaa8063866ad1ff2aef14c27184 100755 (executable)
--- 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}/"