X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=tests%2Fscripts%2Ftest030-relay;h=4d8f50438dd197ec323a4f9d92e982441ea198b5;hb=df20af5c87f8a5294d6e70dd7d984fb8e17ec040;hp=d6bc8b5728acf4e08e496d72f8ceeaabcc9161b7;hpb=9f26171f799d141e2d6fd9c93ab1a0c505f1ff55;p=openldap

diff --git a/tests/scripts/test030-relay b/tests/scripts/test030-relay
index d6bc8b5728..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,7 +17,7 @@ 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 
 
@@ -29,25 +29,40 @@ if test "x$RELAYS" = "x" ; then
 	if test $BACKRELAY = relayno ; then 
 		echo "relay backend not available, test skipped"
 	else
-		RELAYS="${RELAYS}relay "
+		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
-		RELAYS="${RELAYS}ldap "
+		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
-		RELAYS="${RELAYS}meta "
+		if test "x$RELAYS" != "x" ; then
+			RELAYS="${RELAYS} "
+		fi
+		RELAYS="${RELAYS}meta"
 	fi 
 fi
 
-echo "Using $RELAYS..."
+if test "x$RELAYS" = "x" ; then
+	echo "no relaying capable backend is available"
+	echo ">>>>> Test succeeded"
+	exit 0
+fi
+
+echo "Testing virtual naming context mapping with $RELAYS backend(s)..."
 echo ""
 
 first=1