From: Martin Schwenke <martin@meltin.net>
Date: Thu, 5 Sep 2019 03:57:35 +0000 (+1000)
Subject: ctdb-tests: Switch simple tests to use CTDB_TEST_TMP_DIR
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=263890b36dbe23460a3d38050250d6d792907426;p=metze%2Fsamba%2Fwip.git

ctdb-tests: Switch simple tests to use CTDB_TEST_TMP_DIR

CTDB_TEST_TMP_DIR repaces SIMPLE_TESTS_VAR_DIR.  local.bash no longer
needs to ensure that TEST_VAR_DIR is set, since it longer uses this
variable.  Drop the comment because state has not been maintained
between tests for some time.

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

diff --git a/ctdb/tests/simple/scripts/local.bash b/ctdb/tests/simple/scripts/local.bash
index eb91353ac793..9e6cbbc27719 100644
--- a/ctdb/tests/simple/scripts/local.bash
+++ b/ctdb/tests/simple/scripts/local.bash
@@ -1,11 +1,3 @@
-if [ -z "$TEST_VAR_DIR" ] ; then
-	die "TEST_VAR_DIR unset"
-fi
-
-export SIMPLE_TESTS_VAR_DIR="${TEST_VAR_DIR}/simple"
-# Don't remove old directory since state is retained between tests
-mkdir -p "$SIMPLE_TESTS_VAR_DIR"
-
 if [ -n "$TEST_LOCAL_DAEMONS" ] ; then
 	. "${CTDB_TEST_SUITE_DIR}/scripts/local_daemons.bash"
 fi
diff --git a/ctdb/tests/simple/scripts/local_daemons.bash b/ctdb/tests/simple/scripts/local_daemons.bash
index 07284f712869..327c69a9ea9a 100644
--- a/ctdb/tests/simple/scripts/local_daemons.bash
+++ b/ctdb/tests/simple/scripts/local_daemons.bash
@@ -10,7 +10,7 @@ else
 	helper="${CTDB_TEST_DIR}/local_daemons.sh"
 fi
 
-ctdb_local_daemons="${helper} ${SIMPLE_TESTS_VAR_DIR}"
+ctdb_local_daemons="${helper} ${CTDB_TEST_TMP_DIR}"
 
 #######################################