diff options
| author | Linus Nordberg <linus@nordu.net> | 2017-01-27 16:35:21 +0100 |
|---|---|---|
| committer | Linus Nordberg <linus@nordu.net> | 2017-01-30 09:54:08 +0100 |
| commit | 2e54755b9afacdb2d001b7ad4a81a8a23b6f43e0 (patch) | |
| tree | b258faa94aaf6115dda8dc5117c443b2d5e8d6df /test/scripts/testutils.sh | |
| parent | 6df4a9012f03af16779ae4172831367881b4090b (diff) | |
Parallelised merge, distribution phase.
Diffstat (limited to 'test/scripts/testutils.sh')
| -rw-r--r-- | test/scripts/testutils.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/test/scripts/testutils.sh b/test/scripts/testutils.sh index e779e07..6879695 100644 --- a/test/scripts/testutils.sh +++ b/test/scripts/testutils.sh @@ -19,4 +19,5 @@ check_sth() { 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. } |