From 1f9535763a3a5c49728c375988a83897fad48142 Mon Sep 17 00:00:00 2001 From: Magnus Ahltorp Date: Tue, 31 Mar 2015 16:49:53 +0200 Subject: Generate test authentication keys dynamically --- Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index bda7f3a..51fd786 100644 --- a/Makefile +++ b/Makefile @@ -24,8 +24,6 @@ tests-prepare: touch $(PREFIX)/tests/mergedb/logorder mkdir $(PREFIX)/tests/known_roots cp tools/testcerts/roots/* $(PREFIX)/tests/known_roots - cp -r test/config/privatekeys $(PREFIX)/tests - cp -r test/config/publickeys $(PREFIX)/tests @for machine in $(MACHINES); do \ (cd $(PREFIX); ../tools/compileconfig.py --config=../test/catlfish-test.cfg --localconfig ../test/catlfish-test-local-$$machine.cfg) ; \ mkdir -p $(PREFIX)/tests/machine/machine-$$machine/db ; \ @@ -33,9 +31,15 @@ tests-prepare: touch $(PREFIX)/tests/machine/machine-$$machine/db/newentries ; \ done (cd $(PREFIX); ../tools/compileconfig.py --config=../test/catlfish-test.cfg --localconfig ../test/catlfish-test-local-signing.cfg) + mkdir $(PREFIX)/tests/privatekeys + mkdir $(PREFIX)/tests/publickeys @for node in $(NODES); do \ + (cd $(PREFIX)/tests/privatekeys ; ../../../tools/create-key.sh $$node) ; \ + mv $(PREFIX)/tests/privatekeys/$$node.pem $(PREFIX)/tests/publickeys/ ; \ mkdir -p test/nodes/$$node/log ; \ done + (cd $(PREFIX)/tests/privatekeys ; ../../../tools/create-key.sh merge-1) + mv $(PREFIX)/tests/privatekeys/merge-1.pem $(PREFIX)/tests/publickeys/ tests-start: @for node in $(NODES); do \ -- cgit v1.1