X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=tests%2Fscripts%2Ftest016-subref;h=327bcc889412db02fad8cf964cf8bd1468f6d41a;hb=dac408369b0812762b3e85f7e024ea472ce79abc;hp=c5eb1827c723d9aaff5c86be4f708a9f87c92fde;hpb=acbb5cf689a4336af05c9f259d909d8141055bac;p=openldap
diff --git a/tests/scripts/test016-subref b/tests/scripts/test016-subref
index c5eb1827c7..327bcc8894 100755
--- a/tests/scripts/test016-subref
+++ b/tests/scripts/test016-subref
@@ -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
@@ -14,6 +14,7 @@
## .
RCODE=10
+test $BACKEND = null && RCODE=0
echo "running defines.sh"
. $SRCDIR/scripts/defines.sh
@@ -87,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"
@@ -125,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..."
@@ -134,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..."
@@ -143,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"
@@ -153,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..."
@@ -162,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..."
@@ -171,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
@@ -190,4 +191,7 @@ if test $? != 0 ; then
fi
echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
exit 0