X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=tests%2Fscripts%2Ftest034-translucent;h=0514100b7062d8a863646e8d93a0d7df8c95b686;hb=3743a5a68e4d608949d5fd04904733ee5c1ac959;hp=2f6653858bb0c97e9caf3f9ebcba233a505133ec;hpb=0f86c2e8eb07910670ab5262d470efaf6c497898;p=openldap

diff --git a/tests/scripts/test034-translucent b/tests/scripts/test034-translucent
index 2f6653858b..0514100b70 100755
--- a/tests/scripts/test034-translucent
+++ b/tests/scripts/test034-translucent
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 2004-2009 The OpenLDAP Foundation.
+## Copyright 2004-2012 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -185,7 +185,7 @@ $LDAPADD -v -v -v -D "$TRANSLUCENTROOT" -H $URI2 \
 	-w $PASSWD < $LDIFTRANSLUCENTADD > $TESTOUT 2>&1
 
 RC=$?
-if test $RC != 32 ; then
+if test $RC != 32 && test $RC,$BACKEND != 0,null ; then
 	echo "ldapadd failed ($RC), expected NO SUCH OBJECT!"
 	grep "$FAILURE" $TESTOUT
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
@@ -198,7 +198,7 @@ $LDAPMODRDN -D "$TRANSLUCENTROOT" -H $URI2 -w $PASSWD > \
 	$TESTOUT 2>&1 'uid=fred,ou=users,o=translucent' 'uid=someguy'
 
 RC=$?
-if test $RC != 32 ; then
+if test $RC != 32 && test $RC,$BACKEND != 0,null ; then
 	echo "ldapmodrdn failed ($RC), expected NO SUCH OBJECT!"
 	grep "$FAILURE" $TESTOUT
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
@@ -245,7 +245,8 @@ if test $RC != 0 ; then
 fi
 
 $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
-$CMP $SEARCHFLT $LDIFTRANSLUCENTMERGED > $CMPOUT
+$LDIFFILTER < $LDIFTRANSLUCENTMERGED > $LDIFFLT
+$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
 
 if test $? != 0 ; then
 	echo "Comparison failed -- local data failed to merge with remote!"