summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorLinus Nordberg <linus@nordu.net>2015-09-24 16:48:36 +0200
committerLinus Nordberg <linus@nordu.net>2015-11-10 12:48:47 +0100
commit302c45616c3accb22d7e84530da6be17adf2dc8d (patch)
treeaa349b6437e1426ff369f2a4660aa6f0130367e0 /tools
parentaaed8aff7c425c8ac2a15e584e24317da327f5e4 (diff)
Add ERLANGNODES to (generated) test.mk.
merge-1 is a NODE but doesn't have an erl(1) instance.
Diffstat (limited to 'tools')
-rwxr-xr-xtools/compileconfig.py3
1 files changed, 3 insertions, 0 deletions
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"]