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 bc941a50df4a1e8182814b2b87156aa1eec242f9..0e961cf24a54903dc67a54f6e67a25f3a2ee6bf7 100644 (file)
--- 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