X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=tests%2Fscripts%2Ftest035-meta;h=cfbd569771520ff7a4b4ade2c7922bffb2f004a7;hb=fc1396fa2e94ee2e752fd7c3ea5bb22f6592398a;hp=36731c62cb721e2c43f671b837c7c7becdc32773;hpb=4af9eb971559e3a1f0432615e93ec870dc753ddb;p=openldap

diff --git a/tests/scripts/test035-meta b/tests/scripts/test035-meta
index 36731c62cb..cfbd569771 100755
--- a/tests/scripts/test035-meta
+++ b/tests/scripts/test035-meta
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2009 The OpenLDAP Foundation.
+## Copyright 1998-2012 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -485,14 +485,14 @@ $LDAPSEARCH -S "" -h $LOCALHOST -p $PORT3 \
 	-b "$BASEDN" "(objectClass=*)" 1.1 \
 	>> $TESTOUT 2>&1
 RC=$?
-case $RC in 
-	0)
+case $RC,$BACKEND in
+	4,* | 0,null)
+	;;
+	0,*)
 		echo "Search should have failed ($RC)!"
 		test $KILLSERVERS != no && kill -HUP $KILLPIDS
 		exit -1
 	;;
-	4)
-	;;
 	*)
 		echo "Search failed ($RC)!"
 		test $KILLSERVERS != no && kill -HUP $KILLPIDS
@@ -509,14 +509,14 @@ $LDAPSEARCH -S "" -h $LOCALHOST -p $PORT3 \
 	-b "$BASEDN" -z 2 "(objectClass=*)" 1.1 \
 	>> $TESTOUT 2>&1
 RC=$?
-case $RC in 
-	0)
+case $RC,$BACKEND in
+	4,* | 0,null)
+	;;
+	0,*)
 		echo "Search should have failed ($RC)!"
 		test $KILLSERVERS != no && kill -HUP $KILLPIDS
 		exit -1
 	;;
-	4)
-	;;
 	*)
 		echo "Search failed ($RC)!"
 		test $KILLSERVERS != no && kill -HUP $KILLPIDS
@@ -525,9 +525,9 @@ case $RC in
 esac
 
 echo "Filtering ldapsearch results..."
-. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
+$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
 echo "Filtering original ldif used to create database..."
-. $LDIFFILTER < $METAOUT > $LDIFFLT
+$LDIFFILTER < $METAOUT > $LDIFFLT
 echo "Comparing filter output..."
 $CMP $SEARCHFLT $LDIFFLT > $CMPOUT
 	
@@ -667,13 +667,15 @@ RC=$?
 #	test $KILLSERVERS != no && kill -HUP $KILLPIDS
 #	exit $RC
 #fi
-case $RC in 
-	0)
+case $RC,$BACKEND in
+	0,null)
+	;;
+	0,*)
 		echo "WhoAmI should have failed ($RC)!"
 		test $KILLSERVERS != no && kill -HUP $KILLPIDS
 		exit -1
 	;;
-	51)
+	51,*)
 		echo "### Hit LDAP_BUSY problem; you may want to re-run the test"
 	;;
 	*)
@@ -690,13 +692,15 @@ RC=$?
 #	test $KILLSERVERS != no && kill -HUP $KILLPIDS
 #	exit $RC
 #fi
-case $RC in 
-	0)
+case $RC,$BACKEND in
+	0,null)
+	;;
+	0,*)
 		echo "WhoAmI should have failed ($RC)!"
 		test $KILLSERVERS != no && kill -HUP $KILLPIDS
 		exit -1
 	;;
-	51)
+	51,*)
 		echo "### Hit LDAP_BUSY problem; you may want to re-run the test"
 	;;
 	*)
@@ -713,16 +717,16 @@ RC=$?
 #	test $KILLSERVERS != no && kill -HUP $KILLPIDS
 #	exit -1
 #fi
-case $RC in 
-	6)
+case $RC,$BACKEND in
+	6,* | 5,null)
 	;;
-	51)
+	51,*)
 		echo "### Hit LDAP_BUSY problem; you may want to re-run the test"
 	;;
 	*)
 		echo "Compare failed ($RC)!"
 		test $KILLSERVERS != no && kill -HUP $KILLPIDS
-		exit $RC
+		exit 1
 	;;
 esac