git.samba.org
/
gd
/
samba-autobuild
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9679c9e
)
ctdb-tests: Allow use of setup_ctdb_base() outside of test cases
author
Martin Schwenke
<martin@meltin.net>
Thu, 11 Oct 2018 09:23:07 +0000
(20:23 +1100)
committer
Amitay Isaacs
<amitay@samba.org>
Tue, 6 Nov 2018 06:16:17 +0000
(07:16 +0100)
Always create an empty event script directory. If $TEST_SUBDIR is
unset then don't use it to look for etc-ctdb/.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
ctdb/tests/scripts/common.sh
patch
|
blob
|
history
diff --git
a/ctdb/tests/scripts/common.sh
b/ctdb/tests/scripts/common.sh
index 41464abe5d50605114216408ae1187e58b94b0c5..c1713fa1f8986765a8aea8c7028e83ca1ff500ca 100644
(file)
--- a/
ctdb/tests/scripts/common.sh
+++ b/
ctdb/tests/scripts/common.sh
@@
-95,6
+95,12
@@
setup_ctdb_base ()
cp -pr "${CTDB_SCRIPTS_BASE}/${_i}" "${CTDB_BASE}/"
done
+ mkdir -p "${CTDB_BASE}/events/legacy"
+
+ if [ -z "$TEST_SUBDIR" ] ; then
+ return
+ fi
+
for _i in "${TEST_SUBDIR}/etc-ctdb/"* ; do
# No/empty etc-ctdb directory
[ -e "$_i" ] || break