Merge remote branch 'origin/mdb.master'

[openldap] / tests / scripts / test057-memberof-refint

diff --git a/tests/scripts/test057-memberof-refint b/tests/scripts/test057-memberof-refint
index f392ec916c89162cb95e24f7afb7037a267c524b..35e450176e93b24cf39b41bfad1e39c5b8bcb722 100755 (executable)
--- a/tests/scripts/test057-memberof-refint
+++ b/tests/scripts/test057-memberof-refint
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2009 The OpenLDAP Foundation.
+## Copyright 1998-2012 The OpenLDAP Foundation.
 ## Portions Copyright 2008 Red Hat, Inc. 
 ## All rights reserved.
 ##
@@ -27,8 +27,8 @@ if test $REFINT = refintno; then
        exit 0
 fi 
 
-if test "$BACKEND" = "bdb" ; then
-       echo "Test does not support $BACKEND"
+if test $BACKEND = bdb; then
+       echo "$BACKEND backend does not support subtree rename, test skipped"
        exit 0
 fi
 
@@ -66,8 +66,16 @@ fi
 
 cat /dev/null > $TESTOUT
 
+indexInclude="" mainInclude="" bdbInclude="# " nullExclude=""
+test $INDEXDB = indexdb        || indexInclude="# "
+test $MAINDB  = maindb || mainInclude="# "
+case $BACKEND in
+bdb | hdb) bdbInclude="" ;;
+null) nullExclude="# " ;;
+esac
+
 if [ "$MEMBEROF" = memberofmod ]; then
-       echo "Inserting memberof overlay on producer..."
+       echo "Inserting memberof overlay on provider..."
        $LDAPADD -D cn=config -H $URI1 -y $CONFIGPWF <<EOF > $TESTOUT 2>&1
 dn: cn=module,cn=config
 objectClass: olcModuleList
@@ -84,29 +92,24 @@ EOF
        fi
 fi
 
-bdb_conf=""
-case $BACKEND in bdb | hdb)
-bdb_conf="olcDbCacheSize: 1000
-olcDbIndex: objectClass eq
-olcDbIndex: cn pres,eq,sub
-olcDbIndex: uid pres,eq,sub
-olcDbIndex: sn pres,eq,sub
-olcDbMode: 384"
-esac
-
 echo "Running ldapadd to build slapd config database..."
 $LDAPADD -h $LOCALHOST -p $PORT1 -D 'cn=config' -w `cat $CONFIGPWF` \
        >> $TESTOUT 2>&1 <<EOF
 dn: olcDatabase={1}$BACKEND,cn=config
 objectClass: olcDatabaseConfig
-objectClass: olc${BACKEND}Config
+${nullExclude}objectClass: olc${BACKEND}Config
 olcDatabase: {1}$BACKEND
 olcSuffix: $BASEDN
 olcRootDN: cn=Manager,$BASEDN
 olcRootPW:: c2VjcmV0
 olcMonitoring: TRUE
-olcDbDirectory: $TESTDIR/db.1.a/
-$bdb_conf
+${nullExclude}olcDbDirectory: $TESTDIR/db.1.a/
+${bdbInclude}olcDbCacheSize: 1000
+${indexInclude}olcDbIndex: objectClass eq
+${indexInclude}olcDbIndex: cn pres,eq,sub
+${indexInclude}olcDbIndex: uid pres,eq,sub
+${indexInclude}olcDbIndex: sn pres,eq,sub
+${mainInclude}olcDbMode: 384
 
 # {0}memberof, {1}$BACKEND, config
 dn: olcOverlay={0}memberof,olcDatabase={1}$BACKEND,cn=config