Changes from HEAD for beta

[openldap] / tests / scripts / defines.sh

diff --git a/tests/scripts/defines.sh b/tests/scripts/defines.sh
index c45092ccb611e10fd257b4cf4e4fa97cbce56d69..4d3fd7cf931230c4a3c76642e06ac9ac5606df46 100755 (executable)
--- a/tests/scripts/defines.sh
+++ b/tests/scripts/defines.sh
@@ -5,6 +5,12 @@ DATADIR=$SRCDIR/data
 PROGDIR=./progs
 DBDIR=./test-db
 REPLDIR=./test-repl
+R1REPLDIR=$REPLDIR/r1
+R2REPLDIR=$REPLDIR/r2
+P1REPLDIR=$REPLDIR/p1
+P2REPLDIR=$REPLDIR/p2
+P3REPLDIR=$REPLDIR/p3
+CACHEDIR=./test-cache
 
 CONF=$DATADIR/slapd.conf
 MCONF=$DATADIR/slapd-master.conf
@@ -14,8 +20,13 @@ RCONF=$DATADIR/slapd-referrals.conf
 MASTERCONF=$DATADIR/slapd-repl-master.conf
 SRMASTERCONF=$DATADIR/slapd-syncrepl-master.conf
 SLAVECONF=$DATADIR/slapd-repl-slave.conf
-SRREFSLAVECONF=$DATADIR/slapd-syncrepl-slave-refresh.conf
-SRPERSLAVECONF=$DATADIR/slapd-syncrepl-slave-persist.conf
+PROXYCACHECONF=$DATADIR/slapd-proxycache.conf
+CACHEMASTERCONF=$DATADIR/slapd-cache-master.conf
+R1SRSLAVECONF=$DATADIR/slapd-syncrepl-slave-refresh1.conf
+R2SRSLAVECONF=$DATADIR/slapd-syncrepl-slave-refresh2.conf
+P1SRSLAVECONF=$DATADIR/slapd-syncrepl-slave-persist1.conf
+P2SRSLAVECONF=$DATADIR/slapd-syncrepl-slave-persist2.conf
+P3SRSLAVECONF=$DATADIR/slapd-syncrepl-slave-persist3.conf
 REFSLAVECONF=$DATADIR/slapd-ref-slave.conf
 SUBMASTERCONF=$DATADIR/slapd-repl-submaster.conf
 SUBSLAVECONF=$DATADIR/slapd-repl-subslave.conf
@@ -25,6 +36,12 @@ GLUECONF=$DATADIR/slapd-glue.conf
 DBCONF=$DBDIR/slapd.conf
 ADDCONF=$DBDIR/slapadd.conf
 REPLCONF=$REPLDIR/slapd.conf
+R1REPLCONF=$R1REPLDIR/slapd.conf
+R2REPLCONF=$R2REPLDIR/slapd.conf
+P1REPLCONF=$P1REPLDIR/slapd.conf
+P2REPLCONF=$P2REPLDIR/slapd.conf
+P3REPLCONF=$P3REPLDIR/slapd.conf
+CACHECONF=$CACHEDIR/slapd.conf
 
 TOOLARGS="-x $LDAP_TOOLARGS"
 TOOLPROTO="-P 3"
@@ -63,8 +80,18 @@ LVL=${SLAPD_DEBUG-261}
 LOCALHOST=localhost
 PORT=9009
 SLAVEPORT=9010
+R1SLAVEPORT=9011
+R2SLAVEPORT=9012
+P1SLAVEPORT=9013
+P2SLAVEPORT=9014
+P3SLAVEPORT=9015
 MASTERURI="ldap://${LOCALHOST}:$PORT/"
 SLAVEURI="ldap://${LOCALHOST}:$SLAVEPORT/"
+R1SLAVEURI="ldap://${LOCALHOST}:$R1SLAVEPORT/"
+R2SLAVEURI="ldap://${LOCALHOST}:$R2SLAVEPORT/"
+P1SLAVEURI="ldap://${LOCALHOST}:$P1SLAVEPORT/"
+P2SLAVEURI="ldap://${LOCALHOST}:$P2SLAVEPORT/"
+P3SLAVEURI="ldap://${LOCALHOST}:$P3SLAVEPORT/"
 LDIF=$DATADIR/test.ldif
 LDIFGLUED=$DATADIR/test-glued.ldif
 LDIFORDERED=$DATADIR/test-ordered.ldif
@@ -87,15 +114,30 @@ BJORNSDN="cn=Bjorn Jensen,ou=Information Technology DivisioN,OU=People,o=Univers
 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
+R1SLAVELOG=$DBDIR/r1.log
+R2SLAVELOG=$DBDIR/r2.log
+P1SLAVELOG=$DBDIR/p1.log
+P2SLAVELOG=$DBDIR/p2.log
+P3SLAVELOG=$DBDIR/p3.log
 SLURPLOG=$DBDIR/slurp.log
 SEARCHOUT=$DBDIR/ldapsearch.out
 SEARCHFLT=$DBDIR/ldapsearch.flt
 LDIFFLT=$DBDIR/ldif.flt
+R1LDIFFLT=$DBDIR/r1ldif.flt
+R2LDIFFLT=$DBDIR/r2ldif.flt
+P1LDIFFLT=$DBDIR/p1ldif.flt
+P2LDIFFLT=$DBDIR/p2ldif.flt
+P3LDIFFLT=$DBDIR/p3ldif.flt
 SUBFLT0=$DBDIR/sub0.flt
 SUBFLT1=$DBDIR/sub1.flt
 SUBFLT2=$DBDIR/sub2.flt
 MASTEROUT=$DBDIR/master.out
 SLAVEOUT=$DBDIR/slave.out
+R1SLAVEOUT=$DBDIR/r1.out
+R2SLAVEOUT=$DBDIR/r2.out
+P1SLAVEOUT=$DBDIR/p1.out
+P2SLAVEOUT=$DBDIR/p2.out
+P3SLAVEOUT=$DBDIR/p3.out
 SUBMASTEROUT=$DBDIR/submaster.out
 TESTOUT=$DBDIR/test.out
 INITOUT=$DBDIR/init.out