From 7efe8c105125fb96e4e6cb91017b0820b76d22cb Mon Sep 17 00:00:00 2001 From: Magnus Ahltorp Date: Thu, 9 Mar 2017 01:15:44 +0100 Subject: Fix errors in perftest --- test/scripts/perf-test.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/scripts/perf-test.sh b/test/scripts/perf-test.sh index 9b77ddb..a2eb232 100755 --- a/test/scripts/perf-test.sh +++ b/test/scripts/perf-test.sh @@ -39,8 +39,8 @@ python ${top_srcdir}/tools/submitcert.py --parallel=30 --store ${top_srcdir}/tes do_merge 10000 || (tests_stop ; fail "Merge failed") check_sth || (tests_stop ; fail "Check STH failed") -python ${top_srcdir}/tools/storagegc.py --config machine/machine-frontend-1/catlfish-test.cfg --localconfig machine/machine-frontend-1/catlfish-test-local-frontend-1.cfg || fail "GC failed" & -python ${top_srcdir}/tools/storagegc.py --config machine/machine-frontend-1/catlfish-test.cfg --localconfig machine/machine-frontend-2/catlfish-test-local-frontend-2.cfg || fail "GC failed" & +python ${top_srcdir}/tools/storagegc.py --config machine/machine-frontend-1/catlfish-test.cfg --localconfig machine/frontend-1/catlfish-test-local-frontend-1.cfg || fail "GC failed" & +python ${top_srcdir}/tools/storagegc.py --config machine/machine-frontend-1/catlfish-test.cfg --localconfig machine/frontend-2/catlfish-test-local-frontend-2.cfg || fail "GC failed" & wait_for_equal "Tree size" "${top_srcdir}/tools/mergestatus.py --config machine/merge-1/catlfish-test.cfg --localconfig current-merge-localconfig.cfg" "10000 10000 10000" 400 @@ -65,14 +65,14 @@ wait_for_equal "Tree size" "${top_srcdir}/tools/mergestatus.py --config machine/ sleep 5 -tests_stop mergesecondary frontendexceptlast mergeprimary +tests_stop merge_3only frontendexceptlast mergeprimary sleep 5 ${top_srcdir}/tools/genconfig.sh ${top_srcdir}/test/catlfish-test-redistribute-frontend.cfg.in privatekeys keys/logkey.pem httpsca/demoCA/cacert.pem ${top_srcdir}/test/logadminkey-private.pem catlfish-test-generated.cfg ${top_srcdir}/test/scripts/reload-config.sh . ${top_srcdir}/test/test.shvars -tests_start mergesecondary frontendexceptfirst mergeprimary +tests_start merge_3only frontendexceptfirst mergeprimary python ${top_srcdir}/tools/submitcert.py --parallel=1 --store ${top_srcdir}/tools/testcerts/cert2.txt --check-sct --sct-file=submittedcerts https://localhost:8090/ --publickey=keys/logkey.pem --cafile httpsca/demoCA/cacert.pem || fail "Submission failed" -- cgit v1.1