From: Martin Schwenke <martin@meltin.net>
Date: Thu, 7 Mar 2019 04:53:31 +0000 (+1100)
Subject: ctdb-tests: Build cluster mutex path manually
X-Git-Tag: talloc-2.2.0~79
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a215d2017f95974913a7e97c25e5fc613bb79c26;p=thirdparty%2Fsamba.git

ctdb-tests: Build cluster mutex path manually

CTDB_CLUSTER_MUTEX_HELPER can't be depended on because it is only set
when the tests are not installed and setting it unconditionally for
this particular use would be wrong.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13800

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

diff --git a/ctdb/tests/local_daemons.sh b/ctdb/tests/local_daemons.sh
index 07cf1e9b135..3c3897feb50 100755
--- a/ctdb/tests/local_daemons.sh
+++ b/ctdb/tests/local_daemons.sh
@@ -193,7 +193,8 @@ local_daemons_setup ()
 
 	_recovery_lock="${directory}/rec.lock"
 	if $_recovery_lock_use_command ; then
-		_recovery_lock="! ${CTDB_CLUSTER_MUTEX_HELPER} ${_recovery_lock}"
+		_helper="${CTDB_SCRIPTS_HELPER_BINDIR}/ctdb_mutex_fcntl_helper"
+		_recovery_lock="! ${_helper} ${_recovery_lock}"
 	fi
 
 	if [ -n "$_socket_wrapper" ] ; then