From: Martin Schwenke <martin@meltin.net>
Date: Tue, 9 Oct 2018 05:33:51 +0000 (+1100)
Subject: ctdb-tests: Use $CTDB_SCRIPTS_TOOLS_BIN_DIR
X-Git-Tag: tdb-1.3.17~876
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d86fd537ac8990ad6babe55911aaa534cae93b6;p=thirdparty%2Fsamba.git

ctdb-tests: Use $CTDB_SCRIPTS_TOOLS_BIN_DIR

Don't calculate this locally as _tools_dir.  Add it to PATH
unconditionally - this may result in duplicate entries in PATH but the
resulting code is simpler.

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

diff --git a/ctdb/tests/scripts/common.sh b/ctdb/tests/scripts/common.sh
index bc941a50df4..0e961cf24a5 100644
--- a/ctdb/tests/scripts/common.sh
+++ b/ctdb/tests/scripts/common.sh
@@ -25,11 +25,6 @@ if ! $CTDB_TESTS_ARE_INSTALLED ; then
 
 	ctdb_dir=$(dirname "$CTDB_TEST_DIR")
 
-	_tools_dir="${ctdb_dir}/tools"
-	if [ -d "$_tools_dir" ] ; then
-		PATH="${_tools_dir}:$PATH"
-	fi
-
 	top_dir=$(cd -P "$ctdb_dir" && echo "$PWD") # real path
 	if [ ! -d "${top_dir}/bin" ] ; then
 		top_dir=$(dirname "$top_dir")
@@ -38,6 +33,10 @@ fi
 
 . "${TEST_SCRIPTS_DIR}/script_install_paths.sh"
 
+if [ -d "$CTDB_SCRIPTS_TOOLS_BIN_DIR" ] ; then
+	PATH="${CTDB_SCRIPTS_TOOLS_BIN_DIR}:${PATH}"
+fi
+
 if [ -d "$CTDB_SCRIPTS_TESTS_BINDIR" ] ; then
 	PATH="${CTDB_SCRIPTS_TESTS_BINDIR}:${PATH}"
 fi