To receive notifications about scheduled maintenance, please subscribe to the mailing-list gitlab-operations@sympa.ethz.ch. You can subscribe to the mailing-list at https://sympa.ethz.ch

Commit de6a2b8a authored by Reto Da Forno's avatar Reto Da Forno

TOS_NODE_ID is now also set if OS is 'other' / unspecified

parent 490ba44a
......@@ -347,8 +347,16 @@ def start_test(testid, cur, cn, obsdict_key, obsdict_id):
set_symbols_tool = config.get('dispatcher', 'setsymbolsscript')
symbol_node_id = "FLOCKLAB_NODE_ID"
# keep <os> tag for backwards compatibility
if ((node_id != None) and (osname == 'tinyos')):
symbol_node_id = "TOS_NODE_ID"
if ((node_id != None) and (osname == 'tinyos' or osname == 'other')):
# check whether symbol TOS_NODE_ID exists in the binary
p = subprocess.Popen(['objdump', '-t', imagepath], stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True)
(out, err) = p.communicate()
if p.returncode == 0:
if "TOS_NODE_ID" in out:
logger.debug("Found TOS_NODE_ID in binary file '%s'." % (imagepath))
symbol_node_id = "TOS_NODE_ID"
else:
logger.warn("Failed to search for TOS_NODE_ID in binary file '%s'." % (imagepath))
elif (osname == 'contiki'):
symbol_node_id = None # don't set node ID for OS Contiki
if (arch == 'msp430'):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment