ctdb-tests: Add new variable CTDB_SCRIPTS_HELPER_BINDIR

This will always find a binary helper, as opposed to a script helper,
which currently lives under tools/ in the source tree.

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

diff --git a/ctdb/tests/scripts/script_install_paths.sh b/ctdb/tests/scripts/script_install_paths.sh
index f9da3eba5b5867e787da799e0e1e6b6515dd15dc..97d28492084a983edb16c6b56c5093f7fc57ff8b 100644 (file)
--- a/ctdb/tests/scripts/script_install_paths.sh
+++ b/ctdb/tests/scripts/script_install_paths.sh
@@ -8,6 +8,7 @@ if [  -n "$ctdb_dir" ] ; then
        CTDB_SCRIPTS_SBIN_DIR="${ctdb_dir}/config"
        CTDB_SCRIPTS_TOOLS_BIN_DIR="${ctdb_dir}/tools"
        CTDB_SCRIPTS_TOOLS_HELPER_DIR="${ctdb_dir}/tools"
+       CTDB_SCRIPTS_HELPER_BINDIR="${ctdb_dir}/bin"
 else
        # Installed
        CTDB_SCRIPTS_BASE="/usr/local/etc/ctdb"
@@ -15,7 +16,12 @@ else
        CTDB_SCRIPTS_SBIN_DIR="/usr/local/sbin"
        CTDB_SCRIPTS_TOOLS_BIN_DIR="/usr/local/bin"
        CTDB_SCRIPTS_TOOLS_HELPER_DIR="/usr/local/libexec/ctdb"
+       CTDB_SCRIPTS_HELPER_BINDIR="/usr/local/libexec/ctdb"
 fi
 
-export CTDB_SCRIPTS_BASE CTDB_SCRIPTS_BIN_DIR CTDB_SCRIPTS_INIT_SCRIPT \
-       CTDB_SCRIPTS_SBIN_DIR CTDB_SCRIPTS_TOOLS_HELPER_DIR
+export CTDB_SCRIPTS_BASE \
+       CTDB_SCRIPTS_BIN_DIR \
+       CTDB_SCRIPTS_INIT_SCRIPT \
+       CTDB_SCRIPTS_SBIN_DIR \
+       CTDB_SCRIPTS_TOOLS_HELPER_DIR \
+       CTDB_SCRIPTS_HELPER_BINDIR