From 2e54755b9afacdb2d001b7ad4a81a8a23b6f43e0 Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordu.net>
Date: Fri, 27 Jan 2017 16:35:21 +0100
Subject: Parallelised merge, distribution phase.
---
test/scripts/testutils.sh | 1 +
1 file changed, 1 insertion(+)
(limited to 'test/scripts/testutils.sh')
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.
}
--
cgit v1.1