diff options
| author | Martin Schwenke <martin@meltin.net> | 2018-10-09 16:33:51 +1100 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2018-11-06 07:16:17 +0100 |
| commit | 1d86fd537ac8990ad6babe55911aaa534cae93b6 (patch) | |
| tree | 961e53bb9ce33caa85e744de92f78688781f1156 /ctdb | |
| parent | 7ac5e7ae4413b23c17044cd16ca5db755d3934df (diff) | |
| download | samba-1d86fd537ac8990ad6babe55911aaa534cae93b6.tar.gz | |
ctdb-tests: Use $CTDB_SCRIPTS_TOOLS_BIN_DIR
Don't calculate this locally as _tools_dir. Add it to PATH
unconditionally - this may result in duplicate entries in PATH but the
resulting code is simpler.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb')
| -rw-r--r-- | ctdb/tests/scripts/common.sh | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/ctdb/tests/scripts/common.sh b/ctdb/tests/scripts/common.sh index bc941a50df4..0e961cf24a5 100644 --- a/ctdb/tests/scripts/common.sh +++ b/ctdb/tests/scripts/common.sh @@ -25,11 +25,6 @@ if ! $CTDB_TESTS_ARE_INSTALLED ; then ctdb_dir=$(dirname "$CTDB_TEST_DIR") - _tools_dir="${ctdb_dir}/tools" - if [ -d "$_tools_dir" ] ; then - PATH="${_tools_dir}:$PATH" - fi - top_dir=$(cd -P "$ctdb_dir" && echo "$PWD") # real path if [ ! -d "${top_dir}/bin" ] ; then top_dir=$(dirname "$top_dir") @@ -38,6 +33,10 @@ fi . "${TEST_SCRIPTS_DIR}/script_install_paths.sh" +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}" fi |