From 8364712d93721816695b0faac8284307b6a9d43a Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordu.net>
Date: Mon, 30 Jan 2017 16:28:38 +0100
Subject: Work with permdb too.

---
 test/scripts/light-system-test-prepare-merge-takeover.sh | 1 +
 test/scripts/light-system-test.sh                        | 3 ++-
 test/scripts/testutils.sh                                | 4 ++++
 3 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'test')

diff --git a/test/scripts/light-system-test-prepare-merge-takeover.sh b/test/scripts/light-system-test-prepare-merge-takeover.sh
index c84a17e..085a6a2 100755
--- a/test/scripts/light-system-test-prepare-merge-takeover.sh
+++ b/test/scripts/light-system-test-prepare-merge-takeover.sh
@@ -9,6 +9,7 @@ top_srcdir=$(cd $(dirname $0)/../..; pwd)
 
 mv mergedb mergedb-down
 mv mergedb-secondary mergedb
+init_log
 mkdir mergedb-secondary
 touch mergedb-secondary/logorder
 printf 0 > mergedb-secondary/verifiedsize
diff --git a/test/scripts/light-system-test.sh b/test/scripts/light-system-test.sh
index eee1078..816bd67 100755
--- a/test/scripts/light-system-test.sh
+++ b/test/scripts/light-system-test.sh
@@ -5,7 +5,7 @@ set -o errexit
 
 top_srcdir=$(cd $(dirname $0)/../..; pwd)
 
-. ${top_srcdir}/test/test.shvars
+. ${top_srcdir}/test/scripts/testutils.sh
 
 SCRIPTS=${top_srcdir}/test/scripts
 
@@ -18,6 +18,7 @@ tests_stop() {
 }
 
 ${SCRIPTS}/light-system-test-prepare.sh
+init_log
 tests_start
 ${SCRIPTS}/light-system-test-run-1.sh || (echo "Tests failed"; sleep 5; tests_stop; false)
 sleep 5
diff --git a/test/scripts/testutils.sh b/test/scripts/testutils.sh
index 2aba2d1..ba4221c 100644
--- a/test/scripts/testutils.sh
+++ b/test/scripts/testutils.sh
@@ -39,3 +39,7 @@ do_merge() {
     ${top_srcdir}/tools/merge --config ${top_srcdir}/test/catlfish-test.cfg --timing --localconfig ${top_srcdir}/test/catlfish-test-local-merge.cfg || fail "Merge failed"
     sleep 5                     # FIXME: Just wait for dist instead.
 }
+
+init_log() {
+    ${top_srcdir}/tools/initlog.py --config ${top_srcdir}/test/catlfish-test.cfg --localconfig ${top_srcdir}/test/catlfish-test-local-merge.cfg || fail "Log init failed"
+}
-- 
cgit v1.1