From: Martin Schwenke <martin@meltin.net>
Date: Fri, 6 Sep 2019 11:35:16 +0000 (+1000)
Subject: ctdb-tests: Switch tool unit tests to use CTDB_TEST_TMP_DIR
X-Git-Tag: talloc-2.3.1~728
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1934f673dc7aadf8eb288d4ac1b46876d442e039;p=thirdparty%2Fsamba.git

ctdb-tests: Switch tool unit tests to use CTDB_TEST_TMP_DIR

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
---

diff --git a/ctdb/tests/tool/scripts/local.sh b/ctdb/tests/tool/scripts/local.sh
index 9b2750e62e2..61313504f11 100644
--- a/ctdb/tests/tool/scripts/local.sh
+++ b/ctdb/tests/tool/scripts/local.sh
@@ -1,11 +1,9 @@
 # Hey Emacs, this is a -*- shell-script -*- !!!  :-)
 
-[ -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" \
+setup_ctdb_base "$CTDB_TEST_TMP_DIR" "ctdb-etc" \
 		functions
 
 if "$TEST_VERBOSE" ; then