X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=tests%2Fscripts%2Ftest048-syncrepl-multiproxy;h=978a454c607e25a8b46f7abcca8d4208d3a9b0e1;hb=dac408369b0812762b3e85f7e024ea472ce79abc;hp=69fab7f08472582403c33e868a4ece2855c82d53;hpb=6629ca8655da4e192954bba03f728bcf7a486eda;p=openldap

diff --git a/tests/scripts/test048-syncrepl-multiproxy b/tests/scripts/test048-syncrepl-multiproxy
index 69fab7f084..978a454c60 100755
--- a/tests/scripts/test048-syncrepl-multiproxy
+++ b/tests/scripts/test048-syncrepl-multiproxy
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2008 The OpenLDAP Foundation.
+## Copyright 1998-2011 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -119,7 +119,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting R1 slave slapd on TCP/IP port $PORT3..."
-. $CONFFILTER $BACKEND $MONITORDB < $RSLAVECONF | sed -e 's;\.2\.;.3.;' > $CONF3
+. $CONFFILTER $BACKEND $MONITORDB < $RSLAVECONF | sed -e 's;\.2\.\([^/]*\)$;.3.\1;' > $CONF3
 $SLAPD -f $CONF3 -h $URI3 -d $LVL $TIMING > $LOG3 2>&1 &
 R1SLAVEPID=$!
 if test $WAIT != 0 ; then
@@ -185,9 +185,9 @@ if test $RC != 0 ; then
 fi
 
 #echo "Filtering master results..."
-. $LDIFFILTER < "${MASTEROUT}.1" > $MASTERFLT
+$LDIFFILTER < "${MASTEROUT}.1" > $MASTERFLT
 #echo "Filtering slave results..."
-. $LDIFFILTER < "${SLAVEOUT}.1" > $SLAVEFLT
+$LDIFFILTER < "${SLAVEOUT}.1" > $SLAVEFLT
 
 echo "$CHECK < Comparing retrieved entries from master and P1 slave..."
 $CMP $MASTERFLT $SLAVEFLT > $CMPOUT
@@ -210,7 +210,7 @@ if test $RC != 0 ; then
 fi
 
 #echo "Filtering slave results..."
-. $LDIFFILTER < "${SLAVEOUT}.1" > $SLAVEFLT
+$LDIFFILTER < "${SLAVEOUT}.1" > $SLAVEFLT
 
 echo "$CHECK < Comparing retrieved entries from master and R1 slave..."
 $CMP $MASTERFLT $SLAVEFLT > $CMPOUT
@@ -369,9 +369,9 @@ if test $RC != 0 ; then
 fi
 
 #echo "Filtering master results..."
-. $LDIFFILTER < "${MASTEROUT}.2" > $MASTERFLT
+$LDIFFILTER < "${MASTEROUT}.2" > $MASTERFLT
 #echo "Filtering P1 slave results..."
-. $LDIFFILTER < "${SLAVEOUT}.2" > $SLAVEFLT
+$LDIFFILTER < "${SLAVEOUT}.2" > $SLAVEFLT
 
 echo "$CHECK < Comparing retrieved entries from master and P1 slave..."
 $CMP $MASTERFLT $SLAVEFLT > $CMPOUT
@@ -394,7 +394,7 @@ if test $RC != 0 ; then
 fi
 
 #echo "Filtering slave results..."
-. $LDIFFILTER < "${SLAVEOUT}.2" > $SLAVEFLT
+$LDIFFILTER < "${SLAVEOUT}.2" > $SLAVEFLT
 
 echo "$CHECK < Comparing retrieved entries from master and R1 slave..."
 $CMP $MASTERFLT $SLAVEFLT > $CMPOUT
@@ -454,8 +454,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$MASTERPID $P1SLAVEPID $R1SLAVEPID"
 
-echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..."
-sleep $SLEEP1
+echo "Waiting $SLEEP2 seconds for syncrepl to receive changes..."
+sleep $SLEEP2
 
 #echo "Using ldapsearch to read all the entries from the master..."
 $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \
@@ -480,9 +480,9 @@ if test $RC != 0 ; then
 fi
 
 #echo "Filtering master results..."
-. $LDIFFILTER < "${MASTEROUT}.3" > $MASTERFLT
+$LDIFFILTER < "${MASTEROUT}.3" > $MASTERFLT
 #echo "Filtering slave results..."
-. $LDIFFILTER < "${SLAVEOUT}.3" > $SLAVEFLT
+$LDIFFILTER < "${SLAVEOUT}.3" > $SLAVEFLT
 
 echo "$CHECK < Comparing retrieved entries from master and P1 slave..."
 $CMP $MASTERFLT $SLAVEFLT > $CMPOUT
@@ -505,7 +505,7 @@ if test $RC != 0 ; then
 fi
 
 #echo "Filtering slave results..."
-. $LDIFFILTER < "${SLAVEOUT}.3" > $SLAVEFLT
+$LDIFFILTER < "${SLAVEOUT}.3" > $SLAVEFLT
 
 echo "$CHECK < Comparing retrieved entries from master and R1 slave..."
 $CMP $MASTERFLT $SLAVEFLT > $CMPOUT
@@ -561,9 +561,9 @@ if test $RC != 0 ; then
 fi
 
 #echo "Filtering master results..."
-. $LDIFFILTER < "${MASTEROUT}.4" > $MASTERFLT
+$LDIFFILTER < "${MASTEROUT}.4" > $MASTERFLT
 #echo "Filtering slave results..."
-. $LDIFFILTER < "${SLAVEOUT}.4" > $SLAVEFLT
+$LDIFFILTER < "${SLAVEOUT}.4" > $SLAVEFLT
 
 echo "$CHECK < Comparing retrieved entries from master and P1 slave..."
 $CMP $MASTERFLT $SLAVEFLT > $CMPOUT
@@ -586,7 +586,7 @@ if test $RC != 0 ; then
 fi
 
 #echo "Filtering slave results..."
-. $LDIFFILTER < "${SLAVEOUT}.4" > $SLAVEFLT
+$LDIFFILTER < "${SLAVEOUT}.4" > $SLAVEFLT
 
 echo "$CHECK < Comparing retrieved entries from master and R1 slave..."
 $CMP $MASTERFLT $SLAVEFLT > $CMPOUT