Merge remote branch 'origin/mdb.master'

[openldap] / tests / scripts / conf.sh

diff --git a/tests/scripts/conf.sh b/tests/scripts/conf.sh
index c537b00a2a4900740b19c883d3b760352c26bcb2..9ac081ee2e56f4f19b72eb9d6c74645c13bd1b2d 100755 (executable)
--- a/tests/scripts/conf.sh
+++ b/tests/scripts/conf.sh
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2009 The OpenLDAP Foundation.
+## Copyright 1998-2011 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -33,6 +33,8 @@ else
 fi
 sed -e "s/@BACKEND@/${BACKEND}/"                       \
        -e "s/^#${BACKEND}#//"                          \
+       -e "/^#~/s/^#[^#]*~${BACKEND}~[^#]*#/#omit: /"  \
+               -e "s/^#~[^#]*~#//"                     \
        -e "s/@RELAY@/${RELAY}/"                        \
        -e "s/^#relay-${RELAY}#//"                      \
        -e "s/^#${BACKENDTYPE}#//"                      \
@@ -54,6 +56,8 @@ sed -e "s/@BACKEND@/${BACKEND}/"                      \
        -e "s/^#${AC_translucent}#//"                   \
        -e "s/^#${AC_unique}#//"                        \
        -e "s/^#${AC_valsort}#//"                       \
+       -e "s/^#${INDEXDB}#//"                          \
+       -e "s/^#${MAINDB}#//"                           \
        -e "s/^#${MON}#//"                              \
        -e "s/^#${MONMOD}#//"                           \
        -e "s/^#${SASL}#//"                             \
@@ -71,10 +75,6 @@ sed -e "s/@BACKEND@/${BACKEND}/"                     \
        -e "s;@PORT5@;${PORT5};"                        \
        -e "s;@PORT6@;${PORT6};"                        \
        -e "s/@SASL_MECH@/${SASL_MECH}/"                \
-       -e "s/@CACHETTL@/${CACHETTL}/"                  \
-       -e "s/@NCACHETTL@/${NCACHETTL}/"                \
-       -e "s/@SCACHETTL@/${SCACHETTL}/"                \
-       -e "s/@ENTRY_LIMIT@/${CACHE_ENTRY_LIMIT}/"      \
        -e "s;@TESTDIR@;${TESTDIR};"                    \
        -e "s;@DATADIR@;${DATADIR};"                    \
        -e "s;@SCHEMADIR@;${SCHEMADIR};"