Fix SLAP_CONFIG_DELETE ifdef (already fixed in RE24)

[openldap] / tests / scripts / test016-subref

diff --git a/tests/scripts/test016-subref b/tests/scripts/test016-subref
index 327e403f3c4d9975506493a2e7ced7638daecbd5..327bcc889412db02fad8cf964cf8bd1468f6d41a 100755 (executable)
--- a/tests/scripts/test016-subref
+++ b/tests/scripts/test016-subref
@@ -1,12 +1,25 @@
 #! /bin/sh
 # $OpenLDAP$
+## This work is part of OpenLDAP Software <http://www.openldap.org/>.
+##
+## Copyright 1998-2011 The OpenLDAP Foundation.
+## All rights reserved.
+##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted only as authorized by the OpenLDAP
+## Public License.
+##
+## A copy of this license is available in the file LICENSE in the
+## top-level directory of the distribution or, alternatively, at
+## <http://www.OpenLDAP.org/license.html>.
 
 RCODE=10
+test $BACKEND = null && RCODE=0
 
 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
 
-mkdir $TESTDIR $DBDIR1
+mkdir -p $TESTDIR $DBDIR1
 
 echo "Running slapadd to build slapd database..."
 . $CONFFILTER $BACKEND $MONITORDB < $RCONF > $CONF1
@@ -26,6 +39,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$PID"
 
+sleep 1
+
 echo "Testing slapd searching..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \
@@ -73,7 +88,7 @@ RC=$?
 if test $RC != $RCODE ; then
        echo "ldapsearch: unexpected result ($RC)! (referral expected)"
        test $KILLSERVERS != no && kill -HUP $KILLPIDS
-       exit $RC
+       exit 1
 fi
 
 XREFDN="$REFDN"
@@ -111,7 +126,7 @@ RC=$?
 if test $RC != $RCODE ; then
        echo "ldapsearch: unexpected result ($RC)! (referral expected)"
        test $KILLSERVERS != no && kill -HUP $KILLPIDS
-       exit $RC
+       exit 1
 fi
 
 echo "Testing one-level searching at $XREFDN..."
@@ -120,7 +135,7 @@ RC=$?
 if test $RC != $RCODE ; then
        echo "ldapsearch: unexpected result ($RC)! (referral expected)"
        test $KILLSERVERS != no && kill -HUP $KILLPIDS
-       exit $RC
+       exit 1
 fi
 
 echo "Testing subtree searching at $XREFDN..."
@@ -129,7 +144,7 @@ RC=$?
 if test $RC != $RCODE ; then
        echo "ldapsearch: unexpected result ($RC)! (referral expected)"
        test $KILLSERVERS != no && kill -HUP $KILLPIDS
-       exit $RC
+       exit 1
 fi
 
 XREFDN="uid=xxx,o=abc,$REFDN"
@@ -139,7 +154,7 @@ RC=$?
 if test $RC != $RCODE ; then
        echo "ldapsearch: unexpected result ($RC)! (referral expected)"
        test $KILLSERVERS != no && kill -HUP $KILLPIDS
-       exit $RC
+       exit 1
 fi
 
 echo "Testing one-level searching at $XREFDN..."
@@ -148,7 +163,7 @@ RC=$?
 if test $RC != $RCODE ; then
        echo "ldapsearch: unexpected result ($RC)! (referral expected)"
        test $KILLSERVERS != no && kill -HUP $KILLPIDS
-       exit $RC
+       exit 1
 fi
 
 echo "Testing subtree searching at $XREFDN..."
@@ -157,16 +172,16 @@ RC=$?
 if test $RC != $RCODE ; then
        echo "ldapsearch: unexpected result ($RC)! (referral expected)"
        test $KILLSERVERS != no && kill -HUP $KILLPIDS
-       exit $RC
+       exit 1
 fi
 
 test $KILLSERVERS != no && kill -HUP $KILLPIDS
 
 LDIF=$SEARCHOUTMASTER
 echo "Filtering ldapsearch results..."
-. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
+$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
 echo "Filtering expected LDIF for comparison..."
-. $LDIFFILTER < $REFERRALOUT > $LDIFFLT
+$LDIFFILTER < $REFERRALOUT > $LDIFFLT
 echo "Comparing filter output..."
 $CMP $SEARCHFLT $LDIFFLT > $CMPOUT
 
@@ -176,4 +191,7 @@ if test $? != 0 ; then
 fi
 
 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0