tests: Programs run by tests should be found in $PATH

Signed-off-by: Martin Schwenke <martin@meltin.net>

diff --git a/tests/eventscripts/stubs/ctdb b/tests/eventscripts/stubs/ctdb
index e43784e3bb965d50ca4db68ce201aee4653e7fd8..e06e199fcca770b6f7d6116d2b51d44e0153c8fd 100755 (executable)
--- a/tests/eventscripts/stubs/ctdb
+++ b/tests/eventscripts/stubs/ctdb
@@ -126,7 +126,7 @@ ip_reallocate ()
            fi
            _flags="${_flags}${_flags:+,}${_this}"
        done
-       "$(dirname ${TEST_SUBDIR})/bin/ctdb_takeover_tests" \
+       "ctdb_takeover_tests" \
            "ctdb_takeover_run_core" "$_flags" <"$FAKE_CTDB_IP_LAYOUT" |
            sort >"$_t"
        mv "$_t" "$FAKE_CTDB_IP_LAYOUT"

diff --git a/tests/scripts/common.sh b/tests/scripts/common.sh
index 2d7b2e292e5afa29bc40066b5100a3ebbcd8cf3d..4a51651f4cf8815013ba3cfb13fd707215c349ac 100644 (file)
--- a/tests/scripts/common.sh
+++ b/tests/scripts/common.sh
@@ -10,6 +10,11 @@ fi
 
 CTDB_DIR=$(dirname $(dirname "$TEST_SUBDIR"))
 
+_tests_dir=$(dirname "$TEST_SUBDIR")
+[ -n "$TEST_BIN_DIR" ] || TEST_BIN_DIR="${_tests_dir}/bin"
+[ -n "$CTDB_TOOLS_DIR" ] || CTDB_TOOLS_DIR="${CTDB_DIR}/tools"
+PATH="${TEST_BIN_DIR}:${CTDB_TOOLS_DIR}:${PATH}"
+
 # Print a message and exit.
 die ()
 {

diff --git a/tests/scripts/ctdb_test_env b/tests/scripts/ctdb_test_env
index dce419fc06ecaec6069137979406a86380d1d9da..2614d36207d728f388a8040a7f5d5972b9f10bc5 100755 (executable)
--- a/tests/scripts/ctdb_test_env
+++ b/tests/scripts/ctdb_test_env
@@ -6,9 +6,7 @@ var_dir=$CTDB_DIR/tests/var
 
 ######################################################################
 
-ctdb_tools_dir=$CTDB_DIR/tools
-
-PATH="${TEST_SCRIPTS_DIR}:${ctdb_tools_dir}:${PATH}"
+PATH="${TEST_SCRIPTS_DIR}:${PATH}"
 
 export CTDB_TIMEOUT=60
 

diff --git a/tests/takeover/scripts/local.sh b/tests/takeover/scripts/local.sh
index ba46ef26514e83f8086efb320d2bdcef3466fff2..57e58673773193d3af5689ac2261df5e3f5873e6 100644 (file)
--- a/tests/takeover/scripts/local.sh
+++ b/tests/takeover/scripts/local.sh
@@ -1,6 +1,6 @@
 # Hey Emacs, this is a -*- shell-script -*- !!!  :-)
 
-test_prog="$(dirname ${TEST_SUBDIR})/bin/ctdb_takeover_tests ctdb_takeover_run_core"
+test_prog="ctdb_takeover_tests ctdb_takeover_run_core"
 
 define_test ()
 {

diff --git a/tests/tool/scripts/local.sh b/tests/tool/scripts/local.sh
index 1105628a4b041c441ebc2c1993e0e02b0ca5b1cc..dbff423c22afdcb4f5f03fb9e3cb334181622ff9 100644 (file)
--- a/tests/tool/scripts/local.sh
+++ b/tests/tool/scripts/local.sh
@@ -1,7 +1,5 @@
 # Hey Emacs, this is a -*- shell-script -*- !!!  :-)
 
-test_bin="$(dirname ${TEST_SUBDIR})/bin"
-
 define_test ()
 {
     _f=$(basename "$0" ".sh")
@@ -10,12 +8,12 @@ define_test ()
        func.*)
            _func="${_f#func.}"
            _func="${_func%.*}" # Strip test number
-           test_prog="${test_bin}/ctdb_tool_libctdb ${_func}"
+           test_prog="ctdb_tool_libctdb ${_func}"
            ;;
        stubby.*)
            _cmd="${_f#stubby.}"
            _cmd="${_cmd%.*}" # Strip test number
-           test_prog="${test_bin}/ctdb_tool_stubby ${_cmd}"
+           test_prog="ctdb_tool_stubby ${_cmd}"
            ;;
        *)
            die "Unknown pattern for testcase \"$_f\""