X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=tests%2Fscripts%2Ftest030-relay;h=4d8f50438dd197ec323a4f9d92e982441ea198b5;hb=0dfc478cdf55c5b77203997f69ff98a40cef715f;hp=0e0c11a83bf27a1c11c4bf5527a9addc6a843ac0;hpb=407e58343b60c34f29b0510bddf8847fe54468a2;p=openldap

diff --git a/tests/scripts/test030-relay b/tests/scripts/test030-relay
index 0e0c11a83b..4d8f50438d 100755
--- a/tests/scripts/test030-relay
+++ b/tests/scripts/test030-relay
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2004 The OpenLDAP Foundation.
+## Copyright 1998-2005 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -17,35 +17,53 @@ echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
 
 if test $RWM = rwmno ; then 
-	echo "Rewrite/remap overlay not available, test skipped"
+	echo "rwm (Rewrite/remap) overlay not available, test skipped"
 	exit 0
 fi 
 
 echo ""
 
-RELAYS=
-# back-relay
-if test $BACKRELAY = relayno ; then 
-	echo "relay backend not available, test skipped"
-else
-	RELAYS="$RELAYS relay"
+if test "x$RELAYS" = "x" ; then
+	RELAYS=
+	# back-relay
+	if test $BACKRELAY = relayno ; then 
+		echo "relay backend not available, test skipped"
+	else
+		if test "x$RELAYS" != "x" ; then
+			RELAYS="${RELAYS} "
+		fi
+		RELAYS="${RELAYS}relay"
+	fi
+
+	# back-ldap
+	if test $BACKLDAP = ldapno ; then 
+		echo "ldap backend not available, test skipped"
+	else
+		if test "x$RELAYS" != "x" ; then
+			RELAYS="${RELAYS} "
+		fi
+		RELAYS="${RELAYS}ldap"
+	fi
+
+	# back-meta
+	if test $BACKMETA = metano ; then 
+		echo "meta backend not available, test skipped"
+	else
+		if test "x$RELAYS" != "x" ; then
+			RELAYS="${RELAYS} "
+		fi
+		RELAYS="${RELAYS}meta"
+	fi 
 fi
 
-# back-ldap
-if test $BACKLDAP = ldapno ; then 
-	echo "ldap backend not available, test skipped"
-else
-	RELAYS="$RELAYS ldap"
+if test "x$RELAYS" = "x" ; then
+	echo "no relaying capable backend is available"
+	echo ">>>>> Test succeeded"
+	exit 0
 fi
 
-# back-meta - disable by now, needs work to line up with rwm
-if test $BACKMETA = metano ; then 
-	echo "meta backend not available, test skipped"
-else
-	# RELAYS="$RELAYS meta"
-	echo "==> back-meta disabled by now, needs work"
-	echo ""
-fi 
+echo "Testing virtual naming context mapping with $RELAYS backend(s)..."
+echo ""
 
 first=1
 for RELAY in $RELAYS ; do