From: Martin Schwenke <martin@meltin.net>
Date: Wed, 16 Oct 2019 06:21:51 +0000 (+1100)
Subject: ctdb-tests: Avoid running valgrind under valgrind
X-Git-Tag: talloc-2.3.1~262
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5ae330e5a56553b8809f710230101acf044c98e3;p=thirdparty%2Fsamba.git

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 6217e54332d..3f5729b5a24 100755
--- 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 ()