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 eb91353ac79368fdc4673f081bd86318d5ec7444..9e6cbbc277197443b96d971cbd3b967ab39ec43e 100644 (file)
--- 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 07284f71286922344005f99f3644648f7c77694b..327c69a9ea9a2820f4ae0f0ba38737e80b49c724 100644 (file)
--- 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}"
 
 #######################################