summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Nordberg <linus@nordu.net>2015-05-29 17:44:22 +0200
committerLinus Nordberg <linus@nordu.net>2015-05-29 17:44:22 +0200
commitc14d572f160f05e3d532714ad3b62c0b20b03aa1 (patch)
treef878ee42e0ccf81323d55cceeeb6823b6cddad58 /Makefile
parentd9df4af0fcc91e1988a411892bba0b792ce62427 (diff)
parent42eebf1c68849b1367a8e87757f8019732058c50 (diff)
Merge remote-tracking branch 'refs/remotes/map/fsynclogorder'
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 2acaee2..0657b43 100644
--- a/Makefile
+++ b/Makefile
@@ -48,7 +48,7 @@ tests-prepare:
mv $(INSTDIR)/tests/privatekeys/merge-1.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 $(INSTDIR)/cur-sth.json
+ rm -f $(INSTDIR)/cur-sth.json
tests-start:
@for node in $(NODES); do \