allow refint/unique to run even if overlays are dynamic and backends no

diff --git a/tests/data/slapd-refint.conf b/tests/data/slapd-refint.conf
index 45ee73f9f883f4adccce718f7eb4845121bc7ffb..fd0f4bc8d05b19596aff543171369ac76df3c6a1 100644 (file)
--- a/tests/data/slapd-refint.conf
+++ b/tests/data/slapd-refint.conf
@@ -24,8 +24,9 @@ include ./schema/nis.schema
 pidfile     ./testrun/slapd.1.pid
 argsfile    ./testrun/slapd.1.args
 
-#mod#modulepath        ../servers/slapd/back-@BACKEND@/:../servers/slapd/overlays
+#mod#modulepath        ../servers/slapd/back-@BACKEND@/
 #mod#moduleload        back_@BACKEND@.la
+#refintmod#modulepath  ../servers/slapd/overlays/
 #refintmod#moduleload refint.la
 
 #######################################################################

diff --git a/tests/data/slapd-unique.conf b/tests/data/slapd-unique.conf
index 42278b8e5e49ed84561581d878d2204e722fde58..4953687c9ad86c15272c7eaaae61ce24085af5c5 100644 (file)
--- a/tests/data/slapd-unique.conf
+++ b/tests/data/slapd-unique.conf
@@ -24,8 +24,9 @@ include ./schema/nis.schema
 pidfile     ./testrun/slapd.1.pid
 argsfile    ./testrun/slapd.1.args
 
-#mod#modulepath        ../servers/slapd/back-@BACKEND@/:../servers/slapd/overlays
+#mod#modulepath        ../servers/slapd/back-@BACKEND@/
 #mod#moduleload        back_@BACKEND@.la
+#uniquemod#modulepath  ../servers/slapd/overlays
 #uniquemod#moduleload unique.la
 
 #######################################################################

diff --git a/tests/scripts/conf.sh b/tests/scripts/conf.sh
index 5b5feb95513c7aa3e638e329ec18b2add66acad6..ebb1c7bad5789f94a3a608e0532a003a80b0d580 100755 (executable)
--- a/tests/scripts/conf.sh
+++ b/tests/scripts/conf.sh
@@ -17,14 +17,14 @@ if [ x"$MONITORDB" = x"yes" ] ; then
 else
        MON=nomonitor
 fi
-sed -e "s/@BACKEND@/${BACKEND}/"       \
-       -e "s/^#${BACKEND}#//"                  \
+sed -e "s/@BACKEND@/${BACKEND}/"                       \
+       -e "s/^#${BACKEND}#//"                          \
        -e "s/^#${BACKENDTYPE}#//"                      \
-       -e "s/^#${AC_ldap}#//"                  \
+       -e "s/^#${AC_ldap}#//"                          \
        -e "s/^#${AC_pcache}#//"                        \
        -e "s/^#${AC_ppolicy}#//"                       \
        -e "s/^#${AC_refint}#//"                        \
        -e "s/^#${AC_unique}#//"                        \
        -e "s/^#${MON}#//"                              \
-       -e "s/@CACHETTL@/${CACHETTL}/"   \
+       -e "s/@CACHETTL@/${CACHETTL}/"                  \
        -e "s/@ENTRY_LIMIT@/${CACHE_ENTRY_LIMIT}/"