improve previous commit

[openldap] / tests / scripts / test030-relay

diff --git a/tests/scripts/test030-relay b/tests/scripts/test030-relay
index e7e457caed12ce68612f5ede7fa064fe11fc3d6c..4d8f50438dd197ec323a4f9d92e982441ea198b5 100755 (executable)
--- 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,33 +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
-if test $BACKMETA = metano ; then 
-       echo "meta backend not available, test skipped"
-else
-       RELAYS="$RELAYS meta"
-fi 
+echo "Testing virtual naming context mapping with $RELAYS backend(s)..."
+echo ""
 
 first=1
 for RELAY in $RELAYS ; do