From 616be2a18cea1ecfee327105a58f4f397a7e28f1 Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordu.net>
Date: Fri, 25 Nov 2016 14:29:00 +0100
Subject: Manual rebase onto master with map/robust-distribution.

---
 test/scripts/testutils.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test/scripts/testutils.sh')

diff --git a/test/scripts/testutils.sh b/test/scripts/testutils.sh
index e779e07..d264464 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 --timing --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"
 }
-- 
cgit v1.1