diff options
| author | Linus Nordberg <linus@nordu.net> | 2017-03-09 15:17:58 +0100 |
|---|---|---|
| committer | Linus Nordberg <linus@nordu.net> | 2017-03-09 15:17:58 +0100 |
| commit | 863ef44a16759501c7ce939e93bf2891a552b2e3 (patch) | |
| tree | 0fc28971759e60a044425d6d3f45ccfb596ed2e0 /test/scripts/light-system-test-run-5.sh | |
| parent | 221c6771035d7a3c1e0441a46248a44ca2e99077 (diff) | |
| parent | a08cb72fa60bdb11873a2409c3b5aa8ff2b4667d (diff) | |
Merge remote-tracking branch 'refs/remotes/map/refactor-tests'
Diffstat (limited to 'test/scripts/light-system-test-run-5.sh')
| -rwxr-xr-x | test/scripts/light-system-test-run-5.sh | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/test/scripts/light-system-test-run-5.sh b/test/scripts/light-system-test-run-5.sh index cf0bfaf..73e8f5f 100755 --- a/test/scripts/light-system-test-run-5.sh +++ b/test/scripts/light-system-test-run-5.sh @@ -7,12 +7,7 @@ top_srcdir=$(cd $(dirname $0)/../..; pwd) . ${top_srcdir}/test/scripts/testutils.sh -${top_srcdir}/tools/genconfig.sh ${top_srcdir}/test/catlfish-test.cfg.in privatekeys keys/logkey.pem httpsca/demoCA/cacert.pem ${top_srcdir}/test/logadminkey-private.pem catlfish-test-generated.cfg - -for machine in ${MACHINES}; do \ - ${top_srcdir}/tools/getconfig.sh machine/machine-${machine}/catlfish-test-local-${machine}.cfg machine/machine-${machine}/catlfish-test.cfg frontend-${machine}.plopcontrol -done - +${top_srcdir}/test/scripts/reload-config.sh do_merge 9 sleep 3 |