ctdb-tests: Rename CTDB_SCRIPTS_TESTS_BINDIR to CTDB_SCRIPTS_TESTS_LIBEXEC_DIR

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 ec06fa0c8db7e044a7c7981ea75534a4325c097e..519219ca982a3d94436b9067c33e1abf3148ae90 100644 (file)
--- a/ctdb/tests/scripts/common.sh
+++ b/ctdb/tests/scripts/common.sh
@@ -25,8 +25,8 @@ 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}"
+if [ -d "$CTDB_SCRIPTS_TESTS_LIBEXEC_DIR" ] ; then
+       PATH="${CTDB_SCRIPTS_TESTS_LIBEXEC_DIR}:${PATH}"
 fi
 
 # Wait until either timeout expires or command succeeds.  The command

diff --git a/ctdb/tests/scripts/script_install_paths.sh b/ctdb/tests/scripts/script_install_paths.sh
index d67d3fba19f5f39554736149209f00e08ee2e91a..c837cccd0049706f3a93565a1d30fc346b6717fe 100644 (file)
--- a/ctdb/tests/scripts/script_install_paths.sh
+++ b/ctdb/tests/scripts/script_install_paths.sh
@@ -19,7 +19,7 @@ if ! $CTDB_TESTS_ARE_INSTALLED ; then
        CTDB_SCRIPTS_TOOLS_HELPER_DIR="${ctdb_dir}/tools"
        CTDB_SCRIPTS_HELPER_BINDIR="${top_dir}/bin"
        CTDB_SCRIPTS_DATA_DIR="${ctdb_dir}/config"
-       CTDB_SCRIPTS_TESTS_BINDIR="${top_dir}/bin"
+       CTDB_SCRIPTS_TESTS_LIBEXEC_DIR="${top_dir}/bin"
 else
        # Installed
        CTDB_SCRIPTS_BASE="/usr/local/etc/ctdb"
@@ -29,7 +29,7 @@ else
        CTDB_SCRIPTS_TOOLS_HELPER_DIR="/usr/local/libexec/ctdb"
        CTDB_SCRIPTS_HELPER_BINDIR="/usr/local/libexec/ctdb"
        CTDB_SCRIPTS_DATA_DIR="/usr/local/share/ctdb"
-       CTDB_SCRIPTS_TESTS_BINDIR="/usr/local/libexec/ctdb/tests"
+       CTDB_SCRIPTS_TESTS_LIBEXEC_DIR="/usr/local/libexec/ctdb/tests"
 fi
 
 export CTDB_SCRIPTS_BASE \
@@ -40,4 +40,4 @@ export CTDB_SCRIPTS_BASE \
        CTDB_SCRIPTS_TOOLS_HELPER_DIR \
        CTDB_SCRIPTS_HELPER_BINDIR \
        CTDB_SCRIPTS_DATA_DIR \
-       CTDB_SCRIPTS_TESTS_BINDIR
+       CTDB_SCRIPTS_TESTS_LIBEXEC_DIR