From 343264f9f6cf1dceb6cdcfe377ceb336d3a77869 Mon Sep 17 00:00:00 2001 From: Pierangelo Masarati Date: Wed, 21 Apr 2004 23:11:27 +0000 Subject: [PATCH] allow refint/unique to run even if overlays are dynamic and backends no --- tests/data/slapd-refint.conf | 3 ++- tests/data/slapd-unique.conf | 3 ++- tests/scripts/conf.sh | 8 ++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/tests/data/slapd-refint.conf b/tests/data/slapd-refint.conf index 45ee73f9f8..fd0f4bc8d0 100644 --- 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 42278b8e5e..4953687c9a 100644 --- 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 5b5feb9551..ebb1c7bad5 100755 --- 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}/" -- 2.39.5