sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

ctdb-tests: Use ctdb-path for fake_ctdbd directory setup

Browse Source 
This needs to be done before any of the code changes are made,
including updating the ctdb tool.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
This commit is contained in:
Martin Schwenke 2018-05-10 13:27:28 +10:00 committed by Amitay Isaacs
parent d4a1f897af
commit 38566780d2
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ctdb/tests/takeover_helper/scripts/local.sh
View File

@ -10,11 +10,14 @@ fi
. "${TEST_SCRIPTS_DIR}/script_install_paths.sh"
PATH="$PATH:$CTDB_SCRIPTS_TOOLS_HELPER_DIR"
PATH="${PATH}:${CTDB_SCRIPTS_TOOLS_HELPER_DIR}"
PATH="${PATH}:${CTDB_SCRIPTS_HELPER_BINDIR}"
ctdbd_socket="${TEST_VAR_DIR}/ctdbd.socket.$$"
ctdbd_pidfile="${TEST_VAR_DIR}/ctdbd.pid.$$"
ctdbd_dbdir="${TEST_VAR_DIR}/ctdbd.db.$$"
setup_ctdb_base "$TEST_VAR_DIR" "takeover_helper"
ctdbd_socket=$(ctdb-path socket "ctdbd")
ctdbd_pidfile=$(ctdb-path pidfile "ctdbd")
ctdbd_dbdir=$(ctdb-path vardir append "db")
define_test ()
{

9
ctdb/tests/tool/scripts/local.sh
View File

@ -2,6 +2,9 @@
[ -n "$TEST_VAR_DIR" ] || die "TEST_VAR_DIR unset"
PATH="${PATH}:${CTDB_SCRIPTS_TOOLS_HELPER_DIR}"
PATH="${PATH}:${CTDB_SCRIPTS_HELPER_BINDIR}"
setup_ctdb_base "$TEST_VAR_DIR" "unit_tool" \
functions
@ -11,9 +14,9 @@ else
debug () { : ; }
fi
ctdbd_socket="${CTDB_BASE}/ctdbd.socket"
ctdbd_pidfile="${CTDB_BASE}/ctdbd.pid"
ctdbd_dbdir="${CTDB_BASE}/ctdbd.db"
ctdbd_socket=$(ctdb-path socket "ctdbd")
ctdbd_pidfile=$(ctdb-path pidfile "ctdbd")
ctdbd_dbdir=$(ctdb-path vardir append "db")
define_test ()
{