X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=tests%2Fscripts%2Ftest033-glue-syncrepl;h=253510b59139b1ba09a9d69bdd26975e93165e47;hb=fc1396fa2e94ee2e752fd7c3ea5bb22f6592398a;hp=240f5a38a351c35860836563520692221bff1a0f;hpb=fda00af4c17d8d6494f184d30be241a94ccf13c6;p=openldap diff --git a/tests/scripts/test033-glue-syncrepl b/tests/scripts/test033-glue-syncrepl index 240f5a38a3..253510b591 100755 --- a/tests/scripts/test033-glue-syncrepl +++ b/tests/scripts/test033-glue-syncrepl @@ -1,7 +1,8 @@ #! /bin/sh +# $OpenLDAP$ */ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2008 The OpenLDAP Foundation. +## Copyright 1998-2012 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without @@ -12,11 +13,6 @@ ## top-level directory of the distribution or, alternatively, at ## . -case $BACKEND in bdb | hdb | ldif) : ;; *) - echo "Test does not support $BACKEND backend, test skipped" - exit 0 -esac - echo "running defines.sh" . $SRCDIR/scripts/defines.sh @@ -132,12 +128,11 @@ case $RC in ;; esac -SLEEP=15 -echo "Waiting $SLEEP seconds for shadow subtrees to sync..." -sleep $SLEEP +echo "Waiting $SLEEP1 seconds for shadow subtrees to sync..." +sleep $SLEEP1 echo "Filtering original ldif used to create database..." -. $LDIFFILTER < $GLUESYNCOUT > $LDIFFLT +$LDIFFILTER < $GLUESYNCOUT > $LDIFFLT for P in $PORT1 $PORT2 ; do echo "Using ldapsearch to read all the entries from port $P..." @@ -152,7 +147,7 @@ for P in $PORT1 $PORT2 ; do fi echo "Filtering ldapsearch results..." - . $LDIFFILTER < "${SEARCHOUT}.${P}" > $SEARCHFLT + $LDIFFILTER < "${SEARCHOUT}.${P}" > $SEARCHFLT echo "Comparing filter output..." $CMP $SEARCHFLT $LDIFFLT > $CMPOUT @@ -178,7 +173,7 @@ sleep 1 $LDAPSEARCH -H $URI2 -b "$BABSDN" > $TESTOUT 2>&1 RC=$? -if test $RC = 0 ; then +if test $RC = 0 && test $BACKEND != null ; then echo "ldapsearch should have failed ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit -1