diff options
| author | Linus Nordberg <linus@nordu.net> | 2016-11-23 17:09:48 +0100 |
|---|---|---|
| committer | Linus Nordberg <linus@nordu.net> | 2016-11-23 17:09:48 +0100 |
| commit | 19a2a611a839c0318f58347e2d93943c8e2401a5 (patch) | |
| tree | 18cd302161a88d4546b39792a4bff6b1ade95c77 /test/scripts/testutils.sh | |
| parent | 27e368196ce65e109c027987c706a697356f7bc5 (diff) | |
WIP
Merge can run as four separate processes, plus a fifth controlling
proces 'merge'.
Tests are limited to testcase1.py and they're failing because of the
test with the dead merge secondary. Tests are also time consuming
because they're waiting for 60s each time a merge needs to be
verified. This could be improved by peeking at the control files, for
example.
Diffstat (limited to 'test/scripts/testutils.sh')
| -rw-r--r-- | test/scripts/testutils.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/scripts/testutils.sh b/test/scripts/testutils.sh index 94d6223..908c990 100644 --- a/test/scripts/testutils.sh +++ b/test/scripts/testutils.sh @@ -18,5 +18,5 @@ check_sth() { } do_merge() { - ${top_srcdir}/tools/merge --config ${top_srcdir}/test/catlfish-test.cfg --localconfig ${top_srcdir}/test/catlfish-test-local-merge.cfg || fail "Merge failed" + ${top_srcdir}/tools/merge --config ${top_srcdir}/test/catlfish-test.cfg --localconfig ${top_srcdir}/test/catlfish-test-local-merge.cfg $@ || fail "Merge failed" } |