diff options
| author | Magnus Ahltorp <map@kth.se> | 2015-06-18 09:20:14 +0100 |
|---|---|---|
| committer | Linus Nordberg <linus@nordu.net> | 2015-07-31 15:51:29 +0200 |
| commit | 803adf14ec4116d2997feca38c4c259d5d47f71a (patch) | |
| tree | 310a31650464d3eb69792f2b45ecf74b042ac615 /Makefile | |
| parent | b6af0ebacb8cda356edc4769c2751eea06d43aea (diff) | |
Preliminary merge secondary support. Change merge db to lowercase.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 13 |
1 files changed, 10 insertions, 3 deletions
@@ -28,14 +28,19 @@ tests-prepare: mkdir $(INSTDIR)/tests/mergedb mkdir $(INSTDIR)/tests/mergedb/chains touch $(INSTDIR)/tests/mergedb/logorder + mkdir $(INSTDIR)/tests/mergedb-secondary + mkdir $(INSTDIR)/tests/mergedb-secondary/chains + touch $(INSTDIR)/tests/mergedb-secondary/logorder + printf 0 > $(INSTDIR)/tests/mergedb-secondary/verifiedsize mkdir $(INSTDIR)/tests/known_roots cp tools/testcerts/roots/* $(INSTDIR)/tests/known_roots @for machine in $(MACHINES); do \ - (cd $(INSTDIR); ../tools/compileconfig.py --config ../test/catlfish-test.cfg --localconfig ../test/catlfish-test-local-$$machine.cfg) ; \ - mkdir -p $(INSTDIR)/tests/machine/machine-$$machine/db ; \ - touch $(INSTDIR)/tests/machine/machine-$$machine/db/index ; \ + (cd $(INSTDIR); ../tools/compileconfig.py --config ../test/catlfish-test.cfg --localconfig ../test/catlfish-test-local-$$machine.cfg) && \ + mkdir -p $(INSTDIR)/tests/machine/machine-$$machine/db && \ + touch $(INSTDIR)/tests/machine/machine-$$machine/db/index && \ touch $(INSTDIR)/tests/machine/machine-$$machine/db/newentries ; \ done + (cd $(INSTDIR); ../tools/compileconfig.py --config ../test/catlfish-test.cfg --localconfig ../test/catlfish-test-local-merge-2.cfg) (cd $(INSTDIR); ../tools/compileconfig.py --config ../test/catlfish-test.cfg --localconfig ../test/catlfish-test-local-signing.cfg) mkdir $(INSTDIR)/tests/privatekeys mkdir $(INSTDIR)/tests/publickeys @@ -46,6 +51,8 @@ tests-prepare: done (cd $(INSTDIR)/tests/privatekeys ; ../../../tools/create-key.sh merge-1) mv $(INSTDIR)/tests/privatekeys/merge-1.pem $(INSTDIR)/tests/publickeys/ + (cd $(INSTDIR)/tests/privatekeys ; ../../../tools/create-key.sh merge-2) + mv $(INSTDIR)/tests/privatekeys/merge-2.pem $(INSTDIR)/tests/publickeys/ -test -x $(SOFTHSM) && $(SOFTHSM) --init-token --slot=0 --label=mylabel --so-pin=ffff --pin=ffff -test -x $(SOFTHSM) && $(SOFTHSM) --import $(INSTDIR)/tests/keys/logkey-private.pkcs8 --slot 0 --label mylabel --pin ffff --id 00 rm -f $(INSTDIR)/cur-sth.json |