Add ERLANGNODES to (generated) test.mk.

merge-1 is a NODE but doesn't have an erl(1) instance.

2 files changed, 4 insertions, 1 deletions

diff --git a/Makefile b/Makefile
index 92d4577..4f16707 100644
--- a/Makefile
+++ b/Makefile
@@ -58,7 +58,7 @@ tests-prepare:
 	rm -f $(INSTDIR)/cur-sth.json
 
 tests-start:
-	@for node in $(NODES); do \
+	@for node in $(ERLANGNODES); do \
 	  (cd $(INSTDIR) ; 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 \
diff --git a/tools/compileconfig.py b/tools/compileconfig.py
index 552f3b8..cac1be6 100755
--- a/tools/compileconfig.py
+++ b/tools/compileconfig.py
@@ -336,6 +336,8 @@ def gen_testmakefile(config, testmakefile, machines):
     storagenodenames = [node["name"] for node in config["storagenodes"]]
     signingnodenames = [node["name"] for node in config["signingnodes"]]
     mergenodenames = [node["name"] for node in config["mergenodes"]]
+    erlangnodenames = frontendnodenames + storagenodenames + signingnodenames + \
+      filter(lambda name: name != config["primarymergenode"], mergenodenames)
 
     frontendnodeaddresses = [node["publicaddress"] for node in config["frontendnodes"]]
     storagenodeaddresses = [node["address"] for node in config["storagenodes"]]
@@ -343,6 +345,7 @@ def gen_testmakefile(config, testmakefile, machines):
     mergenodeaddresses = [node["address"] for node in config["mergenodes"] if node["name"] != config["primarymergenode"]]
 
     print >>configfile, "NODES=" + " ".join(frontendnodenames+storagenodenames+signingnodenames+mergenodenames)
+    print >>configfile, "ERLANGNODES=" + " ".join(erlangnodenames)
     print >>configfile, "MACHINES=" + " ".join([str(e) for e in range(1, machines+1)])
     print >>configfile, "TESTURLS=" + " ".join(frontendnodeaddresses+storagenodeaddresses+signingnodeaddresses+mergenodeaddresses)
     print >>configfile, "BASEURL=" + config["baseurl"]