Skip to content

Commit 4ff040c

Browse files
authored
Merge pull request #158 from bridadan/patch_port_passing
Fix how missing ports are handled for grm
2 parents f7874e9 + e9ff9a7 commit 4ff040c

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

packages/mbed-greentea/mbed_greentea/mbed_greentea_cli.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -695,7 +695,7 @@ def get_parallel_value(value):
695695
else:
696696
for _ in range(parallel_test_exec):
697697
mbeds_list.append(mbeds.get_dummy_platform(grm_platform_name))
698-
opts.global_resource_mgr = ':'.join(grm_values[1:])
698+
opts.global_resource_mgr = ':'.join([v for v in grm_values[1:] if v])
699699
gt_logger.gt_log_tab("adding dummy platform '%s'"% grm_platform_name)
700700
else:
701701
gt_logger.gt_log("global resource manager switch '--grm %s' in wrong format!"% opts.global_resource_mgr)

src/mbed_os_tools/test/host_tests_conn_proxy/conn_primitive_remote.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ def __init__(self, name, config, importer=__import__):
2323
self.config = config
2424
self.target_id = self.config.get('target_id', None)
2525
self.grm_host = config.get('grm_host', None)
26-
self.grm_port = int(config.get('grm_port', 8000))
26+
self.grm_port = config.get('grm_port', None)
27+
if self.grm_port:
28+
self.grm_port = int(self.grm_port)
2729
self.grm_module = config.get('grm_module', 'unknown')
2830
self.platform_name = config.get('platform_name', None)
2931
self.baudrate = config.get('baudrate', DEFAULT_BAUD_RATE)

0 commit comments

Comments
 (0)