allow to select what relays to use

diff --git a/tests/scripts/test030-relay b/tests/scripts/test030-relay
index e7e457caed12ce68612f5ede7fa064fe11fc3d6c..d6bc8b5728acf4e08e496d72f8ceeaabcc9161b7 100755 (executable)
--- a/tests/scripts/test030-relay
+++ b/tests/scripts/test030-relay
@@ -23,27 +23,32 @@ fi
 
 echo ""
 
-RELAYS=
-# back-relay
-if test $BACKRELAY = relayno ; then 
-       echo "relay backend not available, test skipped"
-else
-       RELAYS="$RELAYS relay"
-fi
+if test "x$RELAYS" = "x" ; then
+       RELAYS=
+       # back-relay
+       if test $BACKRELAY = relayno ; then 
+               echo "relay backend not available, test skipped"
+       else
+               RELAYS="${RELAYS}relay "
+       fi
 
-# back-ldap
-if test $BACKLDAP = ldapno ; then 
-       echo "ldap backend not available, test skipped"
-else
-       RELAYS="$RELAYS ldap"
+       # back-ldap
+       if test $BACKLDAP = ldapno ; then 
+               echo "ldap backend not available, test skipped"
+       else
+               RELAYS="${RELAYS}ldap "
+       fi
+
+       # back-meta
+       if test $BACKMETA = metano ; then 
+               echo "meta backend not available, test skipped"
+       else
+               RELAYS="${RELAYS}meta "
+       fi 
 fi
 
-# back-meta
-if test $BACKMETA = metano ; then 
-       echo "meta backend not available, test skipped"
-else
-       RELAYS="$RELAYS meta"
-fi 
+echo "Using $RELAYS..."
+echo ""
 
 first=1
 for RELAY in $RELAYS ; do