X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=tests%2Fscripts%2Ftest048-syncrepl-multiproxy;h=61422f54289b04f042328b2c555c97917d2389b6;hb=fc1396fa2e94ee2e752fd7c3ea5bb22f6592398a;hp=2bb5629939a11c735abd6c5eb263a809c412de5f;hpb=1de78498cb9273ccbf6951c3eb5d5127f168058e;p=openldap diff --git a/tests/scripts/test048-syncrepl-multiproxy b/tests/scripts/test048-syncrepl-multiproxy index 2bb5629939..61422f5428 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 . ## -## Copyright 1998-2009 The OpenLDAP Foundation. +## Copyright 1998-2012 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without @@ -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