diff options
| author | Martin Schwenke <martin@meltin.net> | 2012-04-24 11:50:36 +1000 |
|---|---|---|
| committer | Martin Schwenke <martin@meltin.net> | 2012-04-27 15:42:42 +1000 |
| commit | b7b6f10e9be4a610866b3aee10491e3292ba09df (patch) | |
| tree | 37fcfb7133f899b5397b26f7a6de539ac52e9d42 /ctdb/tests/scripts/integration.bash | |
| parent | d28e268ed6e165bcb2817d94e8feac763ca2e267 (diff) | |
tests: Improve the logic for adding directories to $PATH
Signed-off-by: Martin Schwenke <martin@meltin.net>
(This used to be ctdb commit e6bfd3bdb3a35b2e7e7c41a6f37976772a54e3ce)
Diffstat (limited to 'ctdb/tests/scripts/integration.bash')
| -rw-r--r-- | ctdb/tests/scripts/integration.bash | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ctdb/tests/scripts/integration.bash b/ctdb/tests/scripts/integration.bash index d13b56e7ea..776ceec855 100644 --- a/ctdb/tests/scripts/integration.bash +++ b/ctdb/tests/scripts/integration.bash @@ -10,7 +10,11 @@ if [ -n "$TEST_LOCAL_DAEMONS" ] ; then CTDB_NODES_SOCKETS="${CTDB_NODES_SOCKETS}${CTDB_NODES_SOCKETS:+ }${TEST_VAR_DIR}/sock.${i}" done - PATH="${CTDB_DIR}/bin:${PATH}" + # Use in-tree binaries if running against local daemons. + # Otherwise CTDB need to be installed on all nodes. + if [ -n "$ctdb_dir" -a -d "${ctdb_dir}/bin" ] ; then + PATH="${ctdb_dir}/bin:${PATH}" + fi export CTDB_NODES="${TEST_VAR_DIR}/nodes.txt" fi |