From e2404caabb5ce3f7dca21cdedddbf744f47e6c3e Mon Sep 17 00:00:00 2001
From: Magnus Ahltorp <map@kth.se>
Date: Sun, 8 Mar 2015 12:39:40 +0100
Subject: Test more

---
 Makefile                      | 20 +++++++++++++++++++-
 test/config/frontend-1.config |  1 +
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index d124325..1837422 100644
--- a/Makefile
+++ b/Makefile
@@ -67,6 +67,14 @@ tests-start:
 tests-run:
 	@(cd tools ; python testcase1.py ) || echo "Tests failed"
 	@(cd tools ; python fetchallcerts.py https://127.0.0.1:8080/) || echo "Verification failed"
+	@(cd tools ; python submitcert.py --store testcerts/cert1.txt --check-sct --sct-file=../rel/submittedcerts https://127.0.0.1:8080/) || echo "Submission failed"
+	@(cd tools ; python submitcert.py --store testcerts/cert2.txt --check-sct --sct-file=../rel/submittedcerts https://127.0.0.1:8080/) || echo "Submission failed"
+	@(cd tools ; python submitcert.py --store testcerts/cert3.txt --check-sct --sct-file=../rel/submittedcerts https://127.0.0.1:8080/) || echo "Submission failed"
+	@(cd tools ; python submitcert.py --store testcerts/cert4.txt --check-sct --sct-file=../rel/submittedcerts https://127.0.0.1:8080/) || echo "Submission failed"
+	@(cd tools ; python submitcert.py --store testcerts/cert5.txt --check-sct --sct-file=../rel/submittedcerts https://127.0.0.1:8080/) || echo "Submission failed"
+
+tests-run2:
+	@(cd tools ; python verifysct.py --sct-file=../rel/submittedcerts --parallel 1 https://127.0.0.1:8080/) || echo "Verification of SCT:s failed"
 
 tests-stop:
 	@for node in $(NODES); do \
@@ -76,7 +84,17 @@ tests-stop:
 tests-wait:
 	sleep 5
 
-tests: tests-prepare tests-start tests-run tests-wait tests-stop
+tests:
+	@make tests-prepare
+	@make tests-start
+	@make tests-run
+	@make tests-wait
+	@make tests-stop
+	@make tests-wait
+	@make tests-start
+	@make tests-run2
+	@make tests-wait
+	@make tests-stop
 
 # Unit testing.
 check: all
diff --git a/test/config/frontend-1.config b/test/config/frontend-1.config
index e7e8af2..8215027 100644
--- a/test/config/frontend-1.config
+++ b/test/config/frontend-1.config
@@ -8,6 +8,7 @@
    {error_logger_mf_maxfiles, 10}]},
  {catlfish,
   [{known_roots_path, "known_roots"},
+   {sctcache_root_path, "tests/machine/machine-1/db/sctcache/"},
    {https_servers,
     [{external_https_api, "127.0.0.1", 8080, v1},
      {frontend_https_api, "127.0.0.1", 8082, frontend}
-- 
cgit v1.1