From 194c9aa3b8c463fa487dc9ef7e172332a8d94d72 Mon Sep 17 00:00:00 2001 From: Magnus Ahltorp Date: Mon, 20 Oct 2014 14:33:41 +0200 Subject: Added external merging support --- Makefile | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 78f8a6b..aa96290 100644 --- a/Makefile +++ b/Makefile @@ -10,8 +10,13 @@ release: ln -s ../../plop/test .) cp httpd_props.conf rel cp catlfish.config rel + cp storage_node.config rel + cp storage_node_httpd.conf rel mkdir rel/catlfish mkdir rel/db + mkdir rel/mergedb + mkdir rel/mergedb/chains + touch rel/mergedb/logorder printf "0" > rel/db/treesize cp -r webroot rel/catlfish test -d rel/catlfish/webroot/log || mkdir rel/catlfish/webroot/log -- cgit v1.1 From 574f96fba9fd01ec9725c5509f02ad13d8ab8793 Mon Sep 17 00:00:00 2001 From: Magnus Ahltorp Date: Fri, 24 Oct 2014 17:22:30 +0200 Subject: System tests for external merge --- Makefile | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index aa96290..66f575f 100644 --- a/Makefile +++ b/Makefile @@ -20,3 +20,36 @@ release: printf "0" > rel/db/treesize cp -r webroot rel/catlfish test -d rel/catlfish/webroot/log || mkdir rel/catlfish/webroot/log + +tests-prepare: + -rm -r rel/known_roots + mkdir rel/known_roots + cp tools/testcerts/roots/* rel/known_roots + + mkdir -p test/nodes/frontend-1/log + mkdir -p test/nodes/storage-1/log + mkdir -p test/nodes/storage-2/log + cp test/config/frontend-1.config rel + cp test/config/frontend-1-httpd.conf rel + cp test/config/storage-1.config rel + cp test/config/storage-1-httpd.conf rel + -rm -r rel/tests + mkdir -p rel/tests/machine/machine-1/db + printf "0" > rel/tests/machine/machine-1/db/treesize + mkdir -p rel/tests/machine/machine-2/db + printf "0" > rel/tests/machine/machine-2/db/treesize + +tests-start: + (cd rel ; bin/run_erl -daemon ../test/nodes/frontend-1/ ../test/nodes/frontend-1/log/ "exec bin/erl -config frontend-1 -name frontend-1") + (cd rel ; bin/run_erl -daemon ../test/nodes/storage-1/ ../test/nodes/storage-1/log/ "exec bin/erl -config storage-1 -name storage-1") + sleep 1 + +tests-run: + (cd tools ; python testcase1.py ) || echo "Tests failed" + +tests-stop: + sleep 5 + echo "halt()." | ./rel/bin/to_erl test/nodes/frontend-1/ + echo "halt()." | ./rel/bin/to_erl test/nodes/storage-1/ + +tests: tests-prepare tests-start tests-run tests-stop -- cgit v1.1 From 87e02103ea3f47b825b415c415f7d2940d009b42 Mon Sep 17 00:00:00 2001 From: Magnus Ahltorp Date: Tue, 28 Oct 2014 16:06:11 +0100 Subject: httpd.conf removed, reflect this in Makefile. Touch test db files. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 66f575f..0239a6c 100644 --- a/Makefile +++ b/Makefile @@ -30,14 +30,14 @@ tests-prepare: mkdir -p test/nodes/storage-1/log mkdir -p test/nodes/storage-2/log cp test/config/frontend-1.config rel - cp test/config/frontend-1-httpd.conf rel cp test/config/storage-1.config rel - cp test/config/storage-1-httpd.conf rel -rm -r rel/tests mkdir -p rel/tests/machine/machine-1/db printf "0" > rel/tests/machine/machine-1/db/treesize mkdir -p rel/tests/machine/machine-2/db printf "0" > rel/tests/machine/machine-2/db/treesize + touch rel/tests/machine/machine-1/db/index + touch rel/tests/machine/machine-1/db/newentries tests-start: (cd rel ; bin/run_erl -daemon ../test/nodes/frontend-1/ ../test/nodes/frontend-1/log/ "exec bin/erl -config frontend-1 -name frontend-1") -- cgit v1.1