Skip to content

Commit 3134bc1

Browse files
Eugeniy Paltsevcarlescufi
authored andcommitted
runners: nsim: allow to use runner if gdb is missing
As of today we check for gdb presence in 'do_create' method and raise an exception in case of gdb is missing. That makes nsim runner unusable without gdb even for the commands which don't use it (like 'flash' command). Fix that. Signed-off-by: Eugeniy Paltsev <[email protected]>
1 parent bc90256 commit 3134bc1

File tree

1 file changed

+7
-4
lines changed
  • scripts/west_commands/runners

1 file changed

+7
-4
lines changed

scripts/west_commands/runners/nsim.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@ def __init__(self, cfg,
2828
gdb_port=DEFAULT_ARC_GDB_PORT,
2929
props=DEFAULT_PROPS_FILE):
3030
super().__init__(cfg)
31-
self.gdb_cmd = [cfg.gdb] + (['-tui'] if tui else [])
31+
if cfg.gdb is None:
32+
self.gdb_cmd = None
33+
else:
34+
self.gdb_cmd = [cfg.gdb] + (['-tui'] if tui else [])
3235
self.nsim_cmd = ['nsimdrv']
3336
self.gdb_port = gdb_port
3437
self.props = props
@@ -46,9 +49,6 @@ def do_add_parser(cls, parser):
4649

4750
@classmethod
4851
def do_create(cls, cfg, args):
49-
if cfg.gdb is None:
50-
raise ValueError('--gdb not provided at command line')
51-
5252
return NsimBinaryRunner(
5353
cfg,
5454
gdb_port=args.gdb_port,
@@ -73,6 +73,9 @@ def do_flash(self, **kwargs):
7373
self.check_call(cmd)
7474

7575
def do_debug(self, **kwargs):
76+
if self.gdb_cmd is None:
77+
raise ValueError('Cannot debug; gdb is missing')
78+
7679
config = kwargs['nsim-cfg']
7780

7881
server_cmd = (self.nsim_cmd + ['-gdb',

0 commit comments

Comments
 (0)