diff options
| author | Linus Nordberg <linus@nordu.net> | 2016-11-25 10:54:17 +0100 |
|---|---|---|
| committer | Linus Nordberg <linus@nordu.net> | 2016-11-25 10:54:17 +0100 |
| commit | 9f436ce835aba793cc06525e160bd2e07dd8f7cd (patch) | |
| tree | 4a6a0a74cd6b054b51a6ab8f1767caf820970d59 /test/scripts/testutils.sh | |
| parent | 034c40cc84f28fd970fc649ffe7eb7fe797479a6 (diff) | |
| parent | ccfe7c55a5d1658c0f98aac2c45e76444dcd0bc2 (diff) | |
Merge remote-tracking branch 'refs/remotes/map/robust-distribution'
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..e779e07 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 --timing --localconfig ${top_srcdir}/test/catlfish-test-local-merge.cfg || fail "Merge failed" } |