diff options
| author | Magnus Ahltorp <map@kth.se> | 2017-03-01 17:04:39 +0100 |
|---|---|---|
| committer | Magnus Ahltorp <map@kth.se> | 2017-03-09 00:50:48 +0100 |
| commit | 8367911e8683311cd6521bcf069c8c71620595f8 (patch) | |
| tree | 6d95b23a32108c35ba244d7481ca775369cb28e6 /test/scripts/testutils.sh | |
| parent | 221c6771035d7a3c1e0441a46248a44ca2e99077 (diff) | |
Refactor tests
Diffstat (limited to 'test/scripts/testutils.sh')
| -rw-r--r-- | test/scripts/testutils.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/scripts/testutils.sh b/test/scripts/testutils.sh index 88e9a54..4d49be8 100644 --- a/test/scripts/testutils.sh +++ b/test/scripts/testutils.sh @@ -25,7 +25,7 @@ get_treesize() { get_treesize_host ${BASEURL} } get_treesize_host() { - ${top_srcdir}/tools/loginfo.py --localconfig machine/merge/catlfish-test-local-merge.cfg --treesize "$1" + ${top_srcdir}/tools/loginfo.py --localconfig current-merge-localconfig.cfg --treesize "$1" } check_sth() { @@ -36,11 +36,11 @@ check_sth_host() { } do_merge() { - n=15 + n=3000 expected_treesize=$1 while [ $n -gt 0 ]; do - ${top_srcdir}/tools/merge --config machine/merge/catlfish-test.cfg --timing --localconfig machine/merge/catlfish-test-local-merge.cfg || fail "Merge failed" - ${top_srcdir}/tools/mergestatus.py --config machine/merge/catlfish-test.cfg --localconfig machine/merge/catlfish-test-local-merge.cfg + ${top_srcdir}/tools/merge --config machine/merge-1/catlfish-test.cfg --timing --localconfig current-merge-localconfig.cfg || fail "Merge failed" + ${top_srcdir}/tools/mergestatus.py --config machine/merge-1/catlfish-test.cfg --localconfig current-merge-localconfig.cfg n=$((n-1)) treesize=$(get_treesize) [ "${treesize}" = "${expected_treesize}" ] && return |