diff options
| author | Linus Nordberg <linus@nordu.net> | 2016-11-25 10:54:17 +0100 |
|---|---|---|
| committer | Linus Nordberg <linus@nordu.net> | 2016-11-25 10:54:17 +0100 |
| commit | 9f436ce835aba793cc06525e160bd2e07dd8f7cd (patch) | |
| tree | 4a6a0a74cd6b054b51a6ab8f1767caf820970d59 /test/scripts/light-system-test-prepare.sh | |
| parent | 034c40cc84f28fd970fc649ffe7eb7fe797479a6 (diff) | |
| parent | ccfe7c55a5d1658c0f98aac2c45e76444dcd0bc2 (diff) | |
Merge remote-tracking branch 'refs/remotes/map/robust-distribution'
Diffstat (limited to 'test/scripts/light-system-test-prepare.sh')
| -rwxr-xr-x | test/scripts/light-system-test-prepare.sh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/test/scripts/light-system-test-prepare.sh b/test/scripts/light-system-test-prepare.sh index 466f3aa..6f6dd07 100755 --- a/test/scripts/light-system-test-prepare.sh +++ b/test/scripts/light-system-test-prepare.sh @@ -39,7 +39,7 @@ createcert () { createca createcert mkdir keys -(cd keys ; ../../../tools/create-key.sh logkey) +(cd keys ; ${top_srcdir}/tools/create-key.sh logkey) openssl pkcs8 -topk8 -nocrypt -in keys/logkey-private.pem -out keys/logkey-private.pkcs8 mkdir mergedb touch mergedb/logorder @@ -47,24 +47,24 @@ mkdir mergedb-secondary touch mergedb-secondary/logorder printf 0 > mergedb-secondary/verifiedsize mkdir known_roots -cp ../../tools/testcerts/roots/* known_roots +cp ${top_srcdir}/tools/testcerts/roots/* known_roots for machine in ${MACHINES}; do \ - ../../tools/compileconfig.py --config ../../test/catlfish-test.cfg --localconfig ../../test/catlfish-test-local-${machine}.cfg + ${top_srcdir}/tools/compileconfig.py --config ${top_srcdir}/test/catlfish-test.cfg --localconfig ${top_srcdir}/test/catlfish-test-local-${machine}.cfg mkdir -p machine/machine-${machine}/db touch machine/machine-${machine}/db/index && touch machine/machine-${machine}/db/newentries done -../../tools/compileconfig.py --config ../../test/catlfish-test.cfg --localconfig ../../test/catlfish-test-local-merge-2.cfg -../../tools/compileconfig.py --config ../../test/catlfish-test.cfg --localconfig ../../test/catlfish-test-local-signing.cfg +${top_srcdir}/tools/compileconfig.py --config ${top_srcdir}/test/catlfish-test.cfg --localconfig ${top_srcdir}/test/catlfish-test-local-merge-2.cfg +${top_srcdir}/tools/compileconfig.py --config ${top_srcdir}/test/catlfish-test.cfg --localconfig ${top_srcdir}/test/catlfish-test-local-signing.cfg mkdir privatekeys mkdir publickeys for node in ${NODES}; do \ - (cd privatekeys ; ../../../tools/create-key.sh ${node}) ; \ + (cd privatekeys ; ${top_srcdir}/tools/create-key.sh ${node}) ; \ mv privatekeys/${node}.pem publickeys/ ; \ mkdir -p nodes/${node}/log done -(cd privatekeys ; ../../../tools/create-key.sh merge-1) +(cd privatekeys ; ${top_srcdir}/tools/create-key.sh merge-1) mv privatekeys/merge-1.pem publickeys/ -(cd privatekeys ; ../../../tools/create-key.sh merge-2) +(cd privatekeys ; ${top_srcdir}/tools/create-key.sh merge-2) mv privatekeys/merge-2.pem publickeys/ test -x ${SOFTHSM} && ${SOFTHSM} --init-token --slot=0 --label=mylabel --so-pin=ffff --pin=ffff || true test -x ${SOFTHSM} && ${SOFTHSM} --import keys/logkey-private.pkcs8 --slot 0 --label mylabel --pin ffff --id 00 || true |