summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMagnus Ahltorp <map@kth.se>2014-10-28 16:06:11 +0100
committerMagnus Ahltorp <map@kth.se>2014-10-28 16:06:11 +0100
commit87e02103ea3f47b825b415c415f7d2940d009b42 (patch)
tree84982f3ad91674e4d3e4cde680add15b58fdec6e /Makefile
parentce6fac1d34f71732e56d5b4e3f4819d6fe282957 (diff)
httpd.conf removed, reflect this in Makefile. Touch test db files.external-merge3
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
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")