Sync with HEAD

[openldap] / tests / scripts / test020-proxycache

diff --git a/tests/scripts/test020-proxycache b/tests/scripts/test020-proxycache
index a8170b9f8f591de6c7803e18eb0e2267f565ca0d..2a94cb65aa3a47df06734bc01bc74261f592227a 100755 (executable)
--- a/tests/scripts/test020-proxycache
+++ b/tests/scripts/test020-proxycache
@@ -28,11 +28,6 @@ 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:
@@ -86,7 +81,7 @@ fi
 
 echo "Starting proxy cache on TCP/IP port $PORT2..."
 . $CONFFILTER < $PROXYCACHECONF > $CONF2
-$SLAPD -f $CONF2 -h $URI2 -d $LVL > $LOG2 2>&1 &
+$SLAPD -f $CONF2 -h $URI2 -d $LVL -d pcache > $LOG2 2>&1 &
 CACHEPID=$!
 if test $WAIT != 0 ; then
        echo CACHEPID $CACHEPID
@@ -139,10 +134,10 @@ if test $RC != 0 ; then
        exit $RC
 fi
 
-echo "Query 3: filter:(sn=Smith*) attrs:cn sn title uid"  
-echo "# Query 3: filter:(sn=Smith*) attrs:cn sn title uid" >> $SLAVEOUT
+echo "Query 3: filter:(sn=Smith*) attrs:cn sn uid"  
+echo "# Query 3: filter:(sn=Smith*) attrs:cn sn uid" >> $SLAVEOUT
 $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT2 \
-       'sn=Smith*' cn sn title uid >> $SLAVEOUT 2>&1
+       'sn=Smith*' cn sn uid >> $SLAVEOUT 2>&1
 RC=$?
 if test $RC != 0 ; then
        echo "ldapsearch failed ($RC)!"
@@ -303,4 +298,7 @@ if test $? != 0 ; then
 fi
 
 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0