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 bf9ed1786ddf7b96a85c46b867b09fcc6817eaaf..4060a0ec15be7482310125f13d594ce9ee5a23af 100755 (executable)
--- a/tests/scripts/defines.sh
+++ b/tests/scripts/defines.sh
@@ -1,35 +1,64 @@
-LDIF2LDBM=../servers/slapd/tools/ldif2ldbm
+
+DATADIR=$SRCDIR/data
+PROGDIR=./progs
+
+if test "$BACKEND" = "bdb2" ; then
+       LDIF2LDBM=../servers/slapd/tools/ldif2ldbm-bdb2
+       CONF=$DATADIR/slapd-bdb2-master.conf
+       ACLCONF=$DATADIR/slapd-bdb2-acl.conf
+       MASTERCONF=$DATADIR/slapd-bdb2-repl-master.conf
+       SLAVECONF=$DATADIR/slapd-bdb2-repl-slave.conf
+       TIMING="-t"
+else
+       LDIF2LDBM=../servers/slapd/tools/ldif2ldbm
+       CONF=$DATADIR/slapd-master.conf
+       ACLCONF=$DATADIR/slapd-acl.conf
+       MASTERCONF=$DATADIR/slapd-repl-master.conf
+       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
+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
 PORT=9009
 SLAVEPORT=9010
-MASTERLOG=./test-db/slapd.log
-SLAVELOG=./test-repl/slapd.log
 DBDIR=./test-db
 REPLDIR=./test-repl
-CONF=./data/slapd-master.conf
-ACLCONF=./data/slapd-acl.conf
-MASTERCONF=./data/slapd-repl-master.conf
-SLAVECONF=./data/slapd-repl-slave.conf
-LDIF=./data/test.ldif
-LDIFORDERED=./data/test-ordered.ldif
+LDIF=$DATADIR/test.ldif
+LDIFORDERED=$DATADIR/test-ordered.ldif
 BASEDN="o=University of Michigan, c=US"
 MANAGERDN="cn=Manager, o=University of Michigan, c=US"
 PASSWD=secret
 BABSDN="cn=Barbara Jensen, ou=Information Technology Division, ou=People, o=University of Michigan, c=US"
 BJORNSDN="cn=Bjorn Jensen, ou=Information Technology Division, ou=People, o=University of Michigan, c=US"
 JAJDN="cn=James A Jones 1, ou=Alumni Association, ou=People, o=University of Michigan, c=US"
+MASTERLOG=$DBDIR/master.log
+SLAVELOG=$DBDIR/slave.log
+SLURPLOG=$DBDIR/slurp.log
 SEARCHOUT=$DBDIR/ldapsearch.out
+SEARCHFLT=$DBDIR/ldapsearch.flt
+LDIFFLT=$DBDIR/ldif.flt
 MASTEROUT=$DBDIR/master.out
 SLAVEOUT=$DBDIR/slave.out
 TESTOUT=$DBDIR/ldapsearch.out
-SEARCHOUTMASTER=./data/search.out.master
-MODIFYOUTMASTER=./data/modify.out.master
-ADDDELOUTMASTER=./data/adddel.out.master
-MODRDNOUTMASTER=./data/modrdn.out.master
-ACLOUTMASTER=./data/acl.out.master
-REPLOUTMASTER=./data/repl.out.master
-MODSRCHFILTERS=./data/modify.search.filters
+SEARCHOUTMASTER=$DATADIR/search.out.master
+MODIFYOUTMASTER=$DATADIR/modify.out.master
+ADDDELOUTMASTER=$DATADIR/adddel.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