diff options
| author | Linus Nordberg <linus@nordu.net> | 2017-03-09 15:17:58 +0100 |
|---|---|---|
| committer | Linus Nordberg <linus@nordu.net> | 2017-03-09 15:17:58 +0100 |
| commit | 863ef44a16759501c7ce939e93bf2891a552b2e3 (patch) | |
| tree | 0fc28971759e60a044425d6d3f45ccfb596ed2e0 /test/scripts/light-system-test-prepare-merge-takeover.sh | |
| parent | 221c6771035d7a3c1e0441a46248a44ca2e99077 (diff) | |
| parent | a08cb72fa60bdb11873a2409c3b5aa8ff2b4667d (diff) | |
Merge remote-tracking branch 'refs/remotes/map/refactor-tests'
Diffstat (limited to 'test/scripts/light-system-test-prepare-merge-takeover.sh')
| -rwxr-xr-x | test/scripts/light-system-test-prepare-merge-takeover.sh | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/test/scripts/light-system-test-prepare-merge-takeover.sh b/test/scripts/light-system-test-prepare-merge-takeover.sh index 057af3d..f27b7f9 100755 --- a/test/scripts/light-system-test-prepare-merge-takeover.sh +++ b/test/scripts/light-system-test-prepare-merge-takeover.sh @@ -7,9 +7,8 @@ top_srcdir=$(cd $(dirname $0)/../..; pwd) . ${top_srcdir}/test/scripts/testutils.sh -mv mergedb mergedb-down -mv mergedb-secondary mergedb -mv mergedb/verifiedsize mergedb/verifiedsize.OFF -mkdir mergedb-secondary -touch mergedb-secondary/logorder -printf 0 > mergedb-secondary/verifiedsize +mv machine/merge-1/db/sth machine/merge-1/db/sth.OFF + +${top_srcdir}/tools/initlog.py --config machine/merge-2/catlfish-test.cfg --localconfig machine/merge-2/catlfish-test-local-merge-2.cfg --promote-secondary + +cp machine/merge-2/catlfish-test-local-merge-2.cfg current-merge-localconfig.cfg |