diff options
| author | Linus Nordberg <linus@nordu.net> | 2015-08-31 14:20:21 +0200 |
|---|---|---|
| committer | Linus Nordberg <linus@nordu.net> | 2015-08-31 14:20:21 +0200 |
| commit | c51097dd9cf2edd506d9aa8f2b0cb646e88759c3 (patch) | |
| tree | 49d00e1d36e88726bfe4fa817a92546b753dd096 | |
| parent | 74dd0360bda561bdd88ec85d9bb07398bf404261 (diff) | |
Don't break when running tests a second time.
mkdir was unhappy when directory 'fetchcertstore' already exists.
| -rw-r--r-- | Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -92,6 +92,7 @@ tests-run: @(cd $(INSTDIR) && python ../tools/merge.py --config ../test/catlfish-test.cfg --localconfig ../test/catlfish-test-local-merge.cfg) || (echo "Merge failed" ; false) @diff -r -x nursery -x verifiedsize catlfish/tests/mergedb catlfish/tests/mergedb-secondary || (echo "Merge databases not matching" ; false) @(cd $(INSTDIR) && python ../tools/check-sth.py --publickey=tests/keys/logkey.pem --cafile tests/httpsca/demoCA/cacert.pem https://localhost:8080/) || (echo "Check failed" ; false) + @(cd $(INSTDIR) && rm -r fetchcertstore || true) @(cd $(INSTDIR) && mkdir fetchcertstore) @(cd $(INSTDIR) && python ../tools/fetchallcerts.py $(BASEURL) --store fetchcertstore --publickey=tests/keys/logkey.pem --cafile tests/httpsca/demoCA/cacert.pem) || (echo "Verification failed" ; false) @(cd $(INSTDIR)/fetchcertstore && unzip 0000.zip) |