From: Martin Schwenke <martin@meltin.net>
Date: Mon, 30 Apr 2018 10:24:40 +0000 (+1000)
Subject: ctdb-tests: Fix location of persistent databases
X-Git-Tag: ldb-1.4.0~475
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eba893f06c99c3585a5c4f8ada39000b7de31439;p=thirdparty%2Fsamba.git

ctdb-tests: Fix location of persistent databases

Always use CTDB_DBDIR_PERSISTENT, which is setup by the test
infrastructure.  The persistent database directory is
not (necessarily) relative to the volatile one.

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

diff --git a/ctdb/tests/eventscripts/00.ctdb.init.007.sh b/ctdb/tests/eventscripts/00.ctdb.init.007.sh
index a0741ce2f33..5121513e248 100755
--- a/ctdb/tests/eventscripts/00.ctdb.init.007.sh
+++ b/ctdb/tests/eventscripts/00.ctdb.init.007.sh
@@ -8,7 +8,7 @@ setup
 
 FAKE_TDBTOOL_SUPPORTS_CHECK="yes"
 
-touch "${CTDB_DBDIR}/persistent/foo.tdb.0"
+touch "${CTDB_DBDIR_PERSISTENT}/foo.tdb.0"
 FAKE_TDB_IS_OK="yes"
 
 ok_null
diff --git a/ctdb/tests/eventscripts/00.ctdb.init.008.sh b/ctdb/tests/eventscripts/00.ctdb.init.008.sh
index 310c101f02c..120aefc3805 100755
--- a/ctdb/tests/eventscripts/00.ctdb.init.008.sh
+++ b/ctdb/tests/eventscripts/00.ctdb.init.008.sh
@@ -8,7 +8,7 @@ setup
 
 FAKE_TDBTOOL_SUPPORTS_CHECK="yes"
 
-db="${CTDB_DBDIR}/persistent/foo.tdb.0"
+db="${CTDB_DBDIR_PERSISTENT}/foo.tdb.0"
 touch "$db"
 FAKE_TDB_IS_OK="no"