diff options
| author | Martin Schwenke <martin@meltin.net> | 2015-02-27 15:17:30 +1100 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2015-03-04 10:42:26 +0100 |
| commit | 9317d82c19a0eb51ff6293d00328a5c36b063a2c (patch) | |
| tree | 3cd4e9704ee7cf7da211383670453732a6f50f10 /ctdb | |
| parent | 2aeb518637af29da03984470d874b94dfb18e34e (diff) | |
| download | samba-9317d82c19a0eb51ff6293d00328a5c36b063a2c.tar.gz samba-9317d82c19a0eb51ff6293d00328a5c36b063a2c.tar.xz samba-9317d82c19a0eb51ff6293d00328a5c36b063a2c.zip | |
ctdb-tests: Support testing scripts that change directory
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb')
| -rw-r--r-- | ctdb/tests/eventscripts/scripts/local.sh | 4 | ||||
| -rw-r--r-- | ctdb/tests/scripts/common.sh | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/ctdb/tests/eventscripts/scripts/local.sh b/ctdb/tests/eventscripts/scripts/local.sh index f044ef8ffb..54a065c76a 100644 --- a/ctdb/tests/eventscripts/scripts/local.sh +++ b/ctdb/tests/eventscripts/scripts/local.sh @@ -9,6 +9,10 @@ EVENTSCRIPTS_PATH="" if [ -d "${TEST_SUBDIR}/stubs" ] ; then EVENTSCRIPTS_PATH="${TEST_SUBDIR}/stubs" + case "$EVENTSCRIPTS_PATH" in + /*) : ;; + *) EVENTSCRIPTS_PATH="${PWD}/${EVENTSCRIPTS_PATH}" ;; + esac fi export EVENTSCRIPTS_PATH diff --git a/ctdb/tests/scripts/common.sh b/ctdb/tests/scripts/common.sh index 754ea2e7e2..287fb71fd1 100644 --- a/ctdb/tests/scripts/common.sh +++ b/ctdb/tests/scripts/common.sh @@ -30,6 +30,10 @@ if [ -f "${_test_dir}/run_tests.sh" ] ; then fi _test_bin_dir="${TEST_BIN_DIR:-${ctdb_dir}/bin}" +case "$_test_bin_dir" in + /*) : ;; + *) _test_bin_dir="${PWD}/${_test_bin_dir}" ;; +esac if [ -d "$_test_bin_dir" ] ; then PATH="${_test_bin_dir}:$PATH" fi |