summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Nordberg <linus@nordberg.se>2015-03-31 16:41:08 +0200
committerLinus Nordberg <linus@nordberg.se>2015-03-31 16:41:08 +0200
commit07bbae40520a0fe5e893f73a29d785d2f3b59eed (patch)
tree09aabaf2d650b692bd24cb496b636c016a193c0c /Makefile
parente4476f7e71e0ebbfe5594bc90d22a9d74d638211 (diff)
Rename RELDIR -> PREFIX.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile78
1 files changed, 39 insertions, 39 deletions
diff --git a/Makefile b/Makefile
index d7b5ee3..bda7f3a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,45 +1,45 @@
-RELDIR=rel
+PREFIX=rel
build all:
./make.erl
clean:
-rm ebin/*.beam
release: all
- rm -rf $(RELDIR)
- mkdir $(RELDIR)
+ rm -rf $(PREFIX)
+ mkdir $(PREFIX)
./makerelease.erl
- mkdir $(RELDIR)/catlfish
+ mkdir $(PREFIX)/catlfish
-include test/test.mk
tests-prepare:
- rm -r $(RELDIR)/tests || true
- mkdir $(RELDIR)/tests
+ rm -r $(PREFIX)/tests || true
+ mkdir $(PREFIX)/tests
make tests-createca
make tests-createcert
- mkdir $(RELDIR)/tests/keys
- (cd $(RELDIR)/tests/keys ; ../../../tools/create-key.sh logkey)
- mkdir $(RELDIR)/tests/mergedb
- mkdir $(RELDIR)/tests/mergedb/chains
- touch $(RELDIR)/tests/mergedb/logorder
- mkdir $(RELDIR)/tests/known_roots
- cp tools/testcerts/roots/* $(RELDIR)/tests/known_roots
- cp -r test/config/privatekeys $(RELDIR)/tests
- cp -r test/config/publickeys $(RELDIR)/tests
+ mkdir $(PREFIX)/tests/keys
+ (cd $(PREFIX)/tests/keys ; ../../../tools/create-key.sh logkey)
+ mkdir $(PREFIX)/tests/mergedb
+ mkdir $(PREFIX)/tests/mergedb/chains
+ 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 $(RELDIR); ../tools/compileconfig.py --config=../test/catlfish-test.cfg --localconfig ../test/catlfish-test-local-$$machine.cfg) ; \
- mkdir -p $(RELDIR)/tests/machine/machine-$$machine/db ; \
- touch $(RELDIR)/tests/machine/machine-$$machine/db/index ; \
- touch $(RELDIR)/tests/machine/machine-$$machine/db/newentries ; \
+ (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 ; \
+ touch $(PREFIX)/tests/machine/machine-$$machine/db/index ; \
+ touch $(PREFIX)/tests/machine/machine-$$machine/db/newentries ; \
done
- (cd $(RELDIR); ../tools/compileconfig.py --config=../test/catlfish-test.cfg --localconfig ../test/catlfish-test-local-signing.cfg)
+ (cd $(PREFIX); ../tools/compileconfig.py --config=../test/catlfish-test.cfg --localconfig ../test/catlfish-test-local-signing.cfg)
@for node in $(NODES); do \
mkdir -p test/nodes/$$node/log ; \
done
tests-start:
@for node in $(NODES); do \
- (cd $(RELDIR) ; bin/run_erl -daemon ../test/nodes/$$node/ ../test/nodes/$$node/log/ "exec bin/erl -config $$node") \
+ (cd $(PREFIX) ; bin/run_erl -daemon ../test/nodes/$$node/ ../test/nodes/$$node/log/ "exec bin/erl -config $$node") \
done
@for i in 1 2 3 4 5 6 7 8 9 10; do \
echo "waiting for system to start" ; \
@@ -55,20 +55,20 @@ tests-start:
done
tests-run:
- @(cd $(RELDIR) && python ../tools/testcase1.py https://localhost:8080/ tests/keys/logkey.pem) || (echo "Tests failed" ; false)
- @(cd $(RELDIR) && python ../tools/fetchallcerts.py $(BASEURL) --publickey=tests/keys/logkey.pem) || (echo "Verification failed" ; false)
- @(cd $(RELDIR) && rm -f submittedcerts)
- @(cd $(RELDIR) && python ../tools/submitcert.py --parallel=1 --store ../tools/testcerts/cert1.txt --check-sct --sct-file=submittedcerts $(BASEURL) --publickey=tests/keys/logkey.pem) || (echo "Submission failed" ; false)
- @(cd $(RELDIR) && python ../tools/submitcert.py --parallel=1 --store ../tools/testcerts/cert2.txt --check-sct --sct-file=submittedcerts $(BASEURL) --publickey=tests/keys/logkey.pem) || (echo "Submission failed" ; false)
- @(cd $(RELDIR) && python ../tools/submitcert.py --parallel=1 --store ../tools/testcerts/cert3.txt --check-sct --sct-file=submittedcerts $(BASEURL) --publickey=tests/keys/logkey.pem) || (echo "Submission failed" ; false)
- @(cd $(RELDIR) && python ../tools/submitcert.py --parallel=1 --store ../tools/testcerts/cert4.txt --check-sct --sct-file=submittedcerts $(BASEURL) --publickey=tests/keys/logkey.pem) || (echo "Submission failed" ; false)
- @(cd $(RELDIR) && python ../tools/submitcert.py --parallel=1 --store ../tools/testcerts/cert5.txt --check-sct --sct-file=submittedcerts $(BASEURL) --publickey=tests/keys/logkey.pem) || (echo "Submission failed" ; false)
- @(cd $(RELDIR) && python ../tools/submitcert.py --parallel=1 --store ../tools/testcerts/pre1.txt --check-sct --sct-file=submittedcerts $(BASEURL) --publickey=tests/keys/logkey.pem) || (echo "Submission failed" ; false)
- @(cd $(RELDIR) && python ../tools/submitcert.py --parallel=1 --store ../tools/testcerts/pre2.txt --check-sct --sct-file=submittedcerts $(BASEURL) --publickey=tests/keys/logkey.pem) || (echo "Submission failed" ; false)
- @(cd $(RELDIR) && python ../tools/merge.py --config ../test/catlfish-test.cfg --localconfig ../test/catlfish-test-local-merge.cfg) || (echo "Merge failed" ; false)
+ @(cd $(PREFIX) && python ../tools/testcase1.py https://localhost:8080/ tests/keys/logkey.pem) || (echo "Tests failed" ; false)
+ @(cd $(PREFIX) && python ../tools/fetchallcerts.py $(BASEURL) --publickey=tests/keys/logkey.pem) || (echo "Verification failed" ; false)
+ @(cd $(PREFIX) && rm -f submittedcerts)
+ @(cd $(PREFIX) && python ../tools/submitcert.py --parallel=1 --store ../tools/testcerts/cert1.txt --check-sct --sct-file=submittedcerts $(BASEURL) --publickey=tests/keys/logkey.pem) || (echo "Submission failed" ; false)
+ @(cd $(PREFIX) && python ../tools/submitcert.py --parallel=1 --store ../tools/testcerts/cert2.txt --check-sct --sct-file=submittedcerts $(BASEURL) --publickey=tests/keys/logkey.pem) || (echo "Submission failed" ; false)
+ @(cd $(PREFIX) && python ../tools/submitcert.py --parallel=1 --store ../tools/testcerts/cert3.txt --check-sct --sct-file=submittedcerts $(BASEURL) --publickey=tests/keys/logkey.pem) || (echo "Submission failed" ; false)
+ @(cd $(PREFIX) && python ../tools/submitcert.py --parallel=1 --store ../tools/testcerts/cert4.txt --check-sct --sct-file=submittedcerts $(BASEURL) --publickey=tests/keys/logkey.pem) || (echo "Submission failed" ; false)
+ @(cd $(PREFIX) && python ../tools/submitcert.py --parallel=1 --store ../tools/testcerts/cert5.txt --check-sct --sct-file=submittedcerts $(BASEURL) --publickey=tests/keys/logkey.pem) || (echo "Submission failed" ; false)
+ @(cd $(PREFIX) && python ../tools/submitcert.py --parallel=1 --store ../tools/testcerts/pre1.txt --check-sct --sct-file=submittedcerts $(BASEURL) --publickey=tests/keys/logkey.pem) || (echo "Submission failed" ; false)
+ @(cd $(PREFIX) && python ../tools/submitcert.py --parallel=1 --store ../tools/testcerts/pre2.txt --check-sct --sct-file=submittedcerts $(BASEURL) --publickey=tests/keys/logkey.pem) || (echo "Submission failed" ; false)
+ @(cd $(PREFIX) && python ../tools/merge.py --config ../test/catlfish-test.cfg --localconfig ../test/catlfish-test-local-merge.cfg) || (echo "Merge failed" ; false)
tests-run2:
- @(cd $(RELDIR) ; python ../tools/verifysct.py --sct-file=submittedcerts --parallel 1 $(BASEURL) --publickey=tests/keys/logkey.pem) || echo "Verification of SCT:s failed"
+ @(cd $(PREFIX) ; python ../tools/verifysct.py --sct-file=submittedcerts --parallel 1 $(BASEURL) --publickey=tests/keys/logkey.pem) || echo "Verification of SCT:s failed"
tests-stop:
@for node in $(NODES); do \
@@ -92,8 +92,8 @@ tests:
@make tests-stop
tests-createca:
- mkdir $(RELDIR)/tests/httpsca
- ( cd $(RELDIR)/tests/httpsca ; \
+ mkdir $(PREFIX)/tests/httpsca
+ ( cd $(PREFIX)/tests/httpsca ; \
mkdir -p demoCA/newcerts ; \
touch demoCA/index.txt ; \
echo 00 > demoCA/serial ; \
@@ -108,12 +108,12 @@ tests-createca:
)
tests-createcert:
- mkdir $(RELDIR)/tests/httpscert
- openssl req -new -newkey rsa:2048 -keyout $(RELDIR)/tests/httpscert/httpskey-1.pem -out $(RELDIR)/tests/httpsca/httpscert-1.csr -nodes -subj '/countryName=SE/stateOrProvinceName=Stockholm/organizationName=Test/CN=localhost'
- ( cd $(RELDIR)/tests/httpsca ; \
+ mkdir $(PREFIX)/tests/httpscert
+ openssl req -new -newkey rsa:2048 -keyout $(PREFIX)/tests/httpscert/httpskey-1.pem -out $(PREFIX)/tests/httpsca/httpscert-1.csr -nodes -subj '/countryName=SE/stateOrProvinceName=Stockholm/organizationName=Test/CN=localhost'
+ ( cd $(PREFIX)/tests/httpsca ; \
openssl ca -in httpscert-1.csr -keyfile key.pem -out httpscert-1.pem -batch \
)
- cp $(RELDIR)/tests/httpsca/httpscert-1.pem $(RELDIR)/tests/httpscert/
+ cp $(PREFIX)/tests/httpsca/httpscert-1.pem $(PREFIX)/tests/httpscert/
# Unit testing.