summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Nordberg <linus@nordberg.se>2015-04-22 18:21:01 +0200
committerLinus Nordberg <linus@nordberg.se>2015-04-23 16:25:48 +0200
commit6758b2e36a058eb5b9a3c2ec719a36a48179225b (patch)
tree23d6d5042ec45031e132f8358e95b144a291393d /Makefile
parent0748083b2e61982108ad8c7375eaa6bef2ea4daa (diff)
Replace halt.py with a more generic to_catlfish.py.
Use to_catlfish.py with "init:stop()". This will be useful for stopping in non testing scenarios.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 5 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 61c3f60..edd3c40 100644
--- a/Makefile
+++ b/Makefile
@@ -84,14 +84,17 @@ tests-run2:
tests-stop:
@for node in $(NODES); do \
- ./tools/halt.py to_erl test/nodes/$$node/ ; \
+ ./tools/to_catlfish.py to_erl test/nodes/$$node/ "init:stop()"; \
done
tests-wait:
sleep 5
-tests:
+tests-makemk:
tools/compileconfig.py --config=test/catlfish-test.cfg --testmakefile=test/test.mk --machines 1
+
+tests:
+ @make tests-makemk
@make tests-prepare
@make tests-start
@make tests-run || (make tests-stop ; false)