X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=tests%2Fscripts%2Ftest011-glue-slapadd;h=be9b3c1b3696e51e295acbf7be954814e82bc1ba;hb=e625581af399028f22f5f6e2cb37ff4eae4a24b0;hp=05c0926a2961ce9430c931c5dd44e79e53613e91;hpb=acbb5cf689a4336af05c9f259d909d8141055bac;p=openldap diff --git a/tests/scripts/test011-glue-slapadd b/tests/scripts/test011-glue-slapadd index 05c0926a29..be9b3c1b36 100755 --- a/tests/scripts/test011-glue-slapadd +++ b/tests/scripts/test011-glue-slapadd @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2006 The OpenLDAP Foundation. +## Copyright 1998-2011 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without @@ -56,9 +56,9 @@ if test $RC != 0 ; then fi echo "Filtering ldapsearch results..." -. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT +$LDIFFILTER -s ldif=e < $SEARCHOUT > $SEARCHFLT echo "Filtering original ldif used to create database..." -. $LDIFFILTER < $LDIFGLUED > $LDIFFLT +$LDIFFILTER -s ldif=e < $LDIFGLUED > $LDIFFLT echo "Comparing filter output..." $CMP $SEARCHFLT $LDIFFLT > $CMPOUT @@ -70,6 +70,7 @@ if test $? != 0 ; then exit 1 fi +if test $BACKEND != null ; then echo "Testing sizelimit..." $LDAPSEARCH -b "$BASEDN" -h $LOCALHOST -p $PORT1 -s one -z 2 > $SEARCHOUT 2>&1 RC=$? @@ -86,8 +87,12 @@ if test $RC = 0 ; then test $KILLSERVERS != no && kill -HUP $KILLPIDS exit 1 fi +fi test $KILLSERVERS != no && kill -HUP $KILLPIDS echo ">>>>> Test succeeded" + +test $KILLSERVERS != no && wait + exit 0