more tests

[openldap] / tests / scripts / test020-proxycache

diff --git a/tests/scripts/test020-proxycache b/tests/scripts/test020-proxycache
index 20d7337777bc6f4cb1a0e2db4d0318a9863d9b09..797d828802a91fc494f33ed1a9be4063fa0af1b6 100755 (executable)
--- a/tests/scripts/test020-proxycache
+++ b/tests/scripts/test020-proxycache
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2004 The OpenLDAP Foundation.
+## Copyright 1998-2005 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -28,6 +28,11 @@ if test $BACKLDAP = "ldapno" ; then
        exit 0
 fi 
 
+if test "x$LVL" = "x0" ; then
+       echo "test020 needs a minimal log level; setting to LDAP_DEBUG_NONE..."
+       LVL=2048
+fi
+
 mkdir -p $TESTDIR $DBDIR1 $DBDIR2
 
 # Test proxy caching:
@@ -99,6 +104,12 @@ for i in 0 1 2 3 4 5; do
        sleep 5
 done
 
+if test $RC != 0 ; then
+       echo "ldapsearch failed ($RC)!"
+       test $KILLSERVERS != no && kill -HUP $KILLPIDS
+       exit $RC
+fi
+
 echo "Making queries on the proxy cache..." 
 echo "Query 1: filter:(sn=Jon) attrs: all" 
 $LDAPSEARCH -x -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT2 \
@@ -193,9 +204,6 @@ else
        exit 1
 fi
 
-echo "ANSWERABILITY RESULTS" >> $SLAVEOUT
-echo "" >> $SLAVEOUT
-
 echo "Query 8: filter:(|(cn=*Jones)(sn=Jones)) attrs:cn sn title uid"  
 $LDAPSEARCH -x -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT2 \
        '(|(cn=*Jones)(sn=Jones))' cn sn title uid >> $SLAVEOUT 2>&1