ctdb-tests: Use $CTDB_SCRIPTS_TESTS_BINDIR

Don't calculate this locally as _test_bin_dir.  Just calculate
top_dir, source script_install_paths.sh and use
$CTDB_SCRIPT_TESTS_BINDIR.

Don't bother sanity checking if TEST_BIN_DIR is set.  It will go away
soon.

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 143ae088b1dfa8f9635ac93402744afaf42b8f2e..bc941a50df4a1e8182814b2b87156aa1eec242f9 100644 (file)
--- a/ctdb/tests/scripts/common.sh
+++ b/ctdb/tests/scripts/common.sh
@@ -17,15 +17,8 @@ fi
 # If we are running from within the source tree then, depending on the
 # tests that we're running, we may need to add the top level bin/ and
 # tools/ subdirectories to $PATH.  In this case, sanity check that
-# run_tests.sh is in the expected place.  If the tests are installed
-# then sanity check that TEST_BIN_DIR is set.
-if $CTDB_TESTS_ARE_INSTALLED ; then
-       if [ -z "$TEST_BIN_DIR" ] ; then
-               die "CTDB_TESTS_ARE_INSTALLED but TEST_BIN_DIR not set"
-       fi
-
-       _test_bin_dir="$TEST_BIN_DIR"
-else
+# run_tests.sh is in the expected place.
+if ! $CTDB_TESTS_ARE_INSTALLED ; then
        if [ ! -f "${CTDB_TEST_DIR}/run_tests.sh" ] ; then
                die "Tests not installed but can't find run_tests.sh"
        fi
@@ -38,20 +31,17 @@ else
        fi
 
        top_dir=$(cd -P "$ctdb_dir" && echo "$PWD") # real path
-
-       _test_bin_dir="${top_dir}/bin"
-       if [ ! -d "$_test_bin_dir" ] ; then
+       if [ ! -d "${top_dir}/bin" ] ; then
                top_dir=$(dirname "$top_dir")
-               _test_bin_dir="${top_dir}/bin"
        fi
 fi
 
-if [ -d "$_test_bin_dir" ] ; then
-       PATH="${_test_bin_dir}:$PATH"
-fi
-
 . "${TEST_SCRIPTS_DIR}/script_install_paths.sh"
 
+if [ -d "$CTDB_SCRIPTS_TESTS_BINDIR" ] ; then
+       PATH="${CTDB_SCRIPTS_TESTS_BINDIR}:${PATH}"
+fi
+
 # Wait until either timeout expires or command succeeds.  The command
 # will be tried once per second, unless timeout has format T/I, where
 # I is the recheck interval.