Add cn=monitor, cn=config, cn=schema to namingContexts.

[openldap] / tests / scripts / defines.sh

diff --git a/tests/scripts/defines.sh b/tests/scripts/defines.sh
index b851971146887233ca505a58f20d29e9fd58a011..4060a0ec15be7482310125f13d594ce9ee5a23af 100755 (executable)
--- a/tests/scripts/defines.sh
+++ b/tests/scripts/defines.sh
@@ -1,16 +1,6 @@
-if test $# -eq 0 ; then
-       SRCDIR="."
-else
-       SRCDIR=$1; shift
-fi
-if test $# -eq 0 ; then
-       BACKEND=ldbm
-else
-       BACKEND=$1; shift
-fi
 
 DATADIR=$SRCDIR/data
-PROGDIR=$SRCDIR/progs
+PROGDIR=./progs
 
 if test "$BACKEND" = "bdb2" ; then
        LDIF2LDBM=../servers/slapd/tools/ldif2ldbm-bdb2
@@ -27,12 +17,17 @@ else
        SLAVECONF=$DATADIR/slapd-repl-slave.conf
 fi
 
+PASSWDCONF=$DATADIR/slapd-passwd.conf
+
+CLIENTDIR=../clients/tools
+#CLIENTDIR=/usr/local/bin
+
 SLAPD=../servers/slapd/slapd
 SLURPD=../servers/slurpd/slurpd
-LDAPSEARCH=../clients/tools/ldapsearch
-LDAPMODIFY=../clients/tools/ldapmodify
-LDAPADD=../clients/tools/ldapadd
-LDAPMODRDN=../clients/tools/ldapmodrdn
+LDAPSEARCH=$CLIENTDIR/ldapsearch
+LDAPMODIFY=$CLIENTDIR/ldapmodify
+LDAPADD=$CLIENTDIR/ldapadd
+LDAPMODRDN=$CLIENTDIR/ldapmodrdn
 SLAPDTESTER=$PROGDIR/slapd-tester
 LVL=${SLAPD_DEBUG-5}
 ADDR=127.0.0.1
@@ -60,7 +55,10 @@ TESTOUT=$DBDIR/ldapsearch.out
 SEARCHOUTMASTER=$DATADIR/search.out.master
 MODIFYOUTMASTER=$DATADIR/modify.out.master
 ADDDELOUTMASTER=$DATADIR/adddel.out.master
-MODRDNOUTMASTER=$DATADIR/modrdn.out.master
+MODRDNOUTMASTER0=$DATADIR/modrdn.out.master.0
+MODRDNOUTMASTER1=$DATADIR/modrdn.out.master.1
+MODRDNOUTMASTER2=$DATADIR/modrdn.out.master.2
+MODRDNOUTMASTER3=$DATADIR/modrdn.out.master.3
 ACLOUTMASTER=$DATADIR/acl.out.master
 REPLOUTMASTER=$DATADIR/repl.out.master
 MODSRCHFILTERS=$DATADIR/modify.search.filters