From c51097dd9cf2edd506d9aa8f2b0cb646e88759c3 Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Mon, 31 Aug 2015 14:20:21 +0200 Subject: Don't break when running tests a second time. mkdir was unhappy when directory 'fetchcertstore' already exists. --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index f212753..2f823e5 100644 --- a/Makefile +++ b/Makefile @@ -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) -- cgit v1.1