From: Martin Schwenke Date: Tue, 13 Aug 2019 00:57:47 +0000 (+1000) Subject: ctdb-tests: New variable CTDB_SCRIPTS_TESTS_BIN_DIR X-Git-Tag: tdb-1.4.2~136 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=027b7ca0036db952d647df41e87498dc66a40054;p=thirdparty%2Fsamba.git ctdb-tests: New variable CTDB_SCRIPTS_TESTS_BIN_DIR This can be used to find ctdb_run_tests and ctdb_local_daemons. Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs --- diff --git a/ctdb/tests/scripts/script_install_paths.sh b/ctdb/tests/scripts/script_install_paths.sh index c837cccd004..2bd8542e4b7 100644 --- a/ctdb/tests/scripts/script_install_paths.sh +++ b/ctdb/tests/scripts/script_install_paths.sh @@ -20,6 +20,7 @@ if ! $CTDB_TESTS_ARE_INSTALLED ; then CTDB_SCRIPTS_HELPER_BINDIR="${top_dir}/bin" CTDB_SCRIPTS_DATA_DIR="${ctdb_dir}/config" CTDB_SCRIPTS_TESTS_LIBEXEC_DIR="${top_dir}/bin" + CTDB_SCRIPTS_TESTS_BIN_DIR="$CTDB_TEST_DIR" else # Installed CTDB_SCRIPTS_BASE="/usr/local/etc/ctdb" @@ -30,6 +31,7 @@ else CTDB_SCRIPTS_HELPER_BINDIR="/usr/local/libexec/ctdb" 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" fi export CTDB_SCRIPTS_BASE \ @@ -40,4 +42,5 @@ export CTDB_SCRIPTS_BASE \ CTDB_SCRIPTS_TOOLS_HELPER_DIR \ CTDB_SCRIPTS_HELPER_BINDIR \ CTDB_SCRIPTS_DATA_DIR \ - CTDB_SCRIPTS_TESTS_LIBEXEC_DIR + CTDB_SCRIPTS_TESTS_LIBEXEC_DIR \ + CTDB_SCRIPTS_TESTS_BIN_DIR