ctdb-tests: Avoid running valgrind under valgrind

When run from integration tests $CTDB already includes $VALGRIND, if
set.  So only add $VALGRIND if $CTDB is not set.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

diff --git a/ctdb/tests/local_daemons.sh b/ctdb/tests/local_daemons.sh
index 6217e54332d2aa7375548eb598544438323b58a8..3f5729b5a2442ff167d8f76874cb35ebbe7caca7 100755 (executable)
--- a/ctdb/tests/local_daemons.sh
+++ b/ctdb/tests/local_daemons.sh
@@ -356,7 +356,7 @@ local_daemons_stop ()
 
        onnode_common
 
-       onnode -p "$_nodes" "${VALGRIND:-} ${CTDB:-ctdb} shutdown"
+       onnode -p "$_nodes" "${CTDB:-${VALGRIND:-} ctdb} shutdown"
 }
 
 local_daemons_onnode_usage ()