X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=tests%2Fscripts%2Ftest016-subref;h=327bcc889412db02fad8cf964cf8bd1468f6d41a;hb=02cff39398a62956aa3a86b834fb317415ccc601;hp=7e4eb660cdc56f69aeabd77b2540b85692b6b2d7;hpb=3c598e89fb34a892d369a138daa8c3314294493c;p=openldap

diff --git a/tests/scripts/test016-subref b/tests/scripts/test016-subref
index 7e4eb660cd..327bcc8894 100755
--- a/tests/scripts/test016-subref
+++ b/tests/scripts/test016-subref
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2004 The OpenLDAP Foundation.
+## Copyright 1998-2011 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -14,11 +14,12 @@
 ## <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
@@ -38,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 \
@@ -85,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"
@@ -123,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..."
@@ -132,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..."
@@ -141,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"
@@ -151,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..."
@@ -160,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..."
@@ -169,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
 
@@ -188,4 +191,7 @@ if test $? != 0 ; then
 fi
 
 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0