summaryrefslogtreecommitdiff
path: root/test/scripts/light-system-test-prepare-merge-takeover.sh
diff options
context:
space:
mode:
authorLinus Nordberg <linus@nordu.net>2017-02-07 14:41:59 +0100
committerLinus Nordberg <linus@nordu.net>2017-02-07 14:41:59 +0100
commit71cc72d3c5e977355ebb0aa8bcb065a08207ec2f (patch)
tree1cdb0030b875fae416f45f138c4c85c58afa2ea2 /test/scripts/light-system-test-prepare-merge-takeover.sh
parent81292083fab81009ac9b1401947feefd094b9384 (diff)
Parallelised merge, sth phase.
Diffstat (limited to 'test/scripts/light-system-test-prepare-merge-takeover.sh')
-rwxr-xr-xtest/scripts/light-system-test-prepare-merge-takeover.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/scripts/light-system-test-prepare-merge-takeover.sh b/test/scripts/light-system-test-prepare-merge-takeover.sh
index 67e5ac7..4b50ad7 100755
--- a/test/scripts/light-system-test-prepare-merge-takeover.sh
+++ b/test/scripts/light-system-test-prepare-merge-takeover.sh
@@ -9,8 +9,8 @@ top_srcdir=$(cd $(dirname $0)/../..; pwd)
mv mergedb mergedb-down
mv mergedb-secondary mergedb
-init_log
-cp mergedb-down/sth mergedb/ # After init_log.
+mv mergedb/verifiedsize mergedb/verifiedsize.OFF
+cp mergedb-down/logorder mergedb/
mkdir mergedb-secondary
touch mergedb-secondary/logorder
printf 0 > mergedb-secondary/verifiedsize