diff options
| author | Martin Schwenke <martin@meltin.net> | 2019-08-13 10:53:48 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2019-08-14 09:11:35 +0000 |
| commit | ba55306fce0025023e6deea637fa8eb13aa73ad2 (patch) | |
| tree | 65c916efe5e58b30e24688a60e6c780ac58e8bf6 /ctdb/tests | |
| parent | 061656d383772b27607b8feb4a4ea9c988ce17d8 (diff) | |
| download | samba-ba55306fce0025023e6deea637fa8eb13aa73ad2.tar.gz | |
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>
Diffstat (limited to 'ctdb/tests')
| -rw-r--r-- | ctdb/tests/scripts/common.sh | 4 | ||||
| -rw-r--r-- | ctdb/tests/scripts/script_install_paths.sh | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ctdb/tests/scripts/common.sh b/ctdb/tests/scripts/common.sh index ec06fa0c8db..519219ca982 100644 --- 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 d67d3fba19f..c837cccd004 100644 --- 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 |