ctdb-tests: Add CTDB_TEST_HELPER_BINDIR

Now that generated scripts are linked into bin/, nothing needs to be
run from the tools/ directory anymore during self-test.  So, introduce
CTDB_TEST_HELPER_BINDIR to replace both CTDB_SCRIPTS_TOOLS_HELPER_DIR
and CTDB_SCRIPTS_HELPER_BINDIR.  Add this directory to PATH.

CTDB_TEST_HELPER_BINDIR will also be used in combination with
CTDB_TEST_MODE to allow helpers to be found via a single mechanism
that uses this single variable.  This will replace the multiple
mechanisms and variables currently used.

For simplicity, leave the old variables alone for now.  Replacing them
in a comprehensible way will take a few steps.

Signed-off-by: Martin Schwenke <mschwenke@ddn.com>
Reviewed-by: Anoop C S <anoopcs@samba.org>

diff --git a/ctdb/tests/scripts/common.sh b/ctdb/tests/scripts/common.sh
index a1bba3bd626982f5e0dc53d24a7291932138ece8..e6b3bfe94d75150a93693c5f9b41e03d0dab121f 100644 (file)
--- a/ctdb/tests/scripts/common.sh
+++ b/ctdb/tests/scripts/common.sh
@@ -15,8 +15,8 @@ die()
 
 . "${TEST_SCRIPTS_DIR}/script_install_paths.sh"
 
-if [ -d "$CTDB_SCRIPTS_TOOLS_BIN_DIR" ]; then
-       PATH="${CTDB_SCRIPTS_TOOLS_BIN_DIR}:${PATH}"
+if [ -d "$CTDB_TEST_HELPER_BINDIR" ]; then
+       PATH="${CTDB_TEST_HELPER_BINDIR}:${PATH}"
 fi
 
 # Used by integration tests (via test_wrap) and unit tests to run test

diff --git a/ctdb/tests/scripts/script_install_paths.sh b/ctdb/tests/scripts/script_install_paths.sh
index a1df45109427f9008fc1b39e50171b5440e4c222..947a00ec743b61cd7d31b63cb5228a137f9870d2 100644 (file)
--- a/ctdb/tests/scripts/script_install_paths.sh
+++ b/ctdb/tests/scripts/script_install_paths.sh
@@ -40,6 +40,9 @@ if ! $CTDB_TESTS_ARE_INSTALLED; then
        CTDB_SCRIPTS_DATA_DIR="${ctdb_dir}/config"
        CTDB_SCRIPTS_TESTS_LIBEXEC_DIR="$bin_dir"
        CTDB_SCRIPTS_TESTS_BIN_DIR="$CTDB_TEST_DIR"
+
+       # Built helpers
+       CTDB_TEST_HELPER_BINDIR="$bin_dir"
 else
        # Installed
        CTDB_SCRIPTS_BASE="/usr/local/etc/ctdb"
@@ -50,6 +53,9 @@ else
        CTDB_SCRIPTS_DATA_DIR="/usr/local/share/ctdb"
        CTDB_SCRIPTS_TESTS_LIBEXEC_DIR="/usr/local/libexec/ctdb/tests"
        CTDB_SCRIPTS_TESTS_BIN_DIR="/usr/local/bin"
+
+       # Installed helpers
+       CTDB_TEST_HELPER_BINDIR="/usr/local/libexec/ctdb"
 fi
 
 export CTDB_SCRIPTS_BASE \
@@ -59,4 +65,5 @@ export CTDB_SCRIPTS_BASE \
        CTDB_SCRIPTS_HELPER_BINDIR \
        CTDB_SCRIPTS_DATA_DIR \
        CTDB_SCRIPTS_TESTS_LIBEXEC_DIR \
-       CTDB_SCRIPTS_TESTS_BIN_DIR
+       CTDB_SCRIPTS_TESTS_BIN_DIR \
+       CTDB_TEST_HELPER_BINDIR