michaelh/zephyr
1
0
Fork 0
Code Releases Activity

sanitycheck: fix setting of west_flash/runner

Browse source 
We are not propagting those options all the way to the device handler
now, fix this by using the suite member in the handler which has those
already.

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2020-03-31 08:37:55 -04:00 • committed by Johan Hedberg
commit c11f8acbb3
1 changed files with 5 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
scripts/sanity_chk/sanitylib.py
View file

@ -451,8 +451,6 @@ class DeviceHandler(Handler):
super().__init__(instance, type_str) super().__init__(instance, type_str)
self.suite = None self.suite = None
self.west_flash = None
self.west_runner = None
def monitor_serial(self, ser, halt_fileno, harness): def monitor_serial(self, ser, halt_fileno, harness):
log_out_fp = open(self.log, "wt") log_out_fp = open(self.log, "wt")
@ -532,11 +530,11 @@ class DeviceHandler(Handler):
def handle(self): def handle(self):
out_state = "failed" out_state = "failed"
if self.west_flash: if self.suite.west_flash:
command = ["west", "flash", "--skip-rebuild", "-d", self.build_dir] command = ["west", "flash", "--skip-rebuild", "-d", self.build_dir]
if self.west_runner: if self.suite.west_runner:
command.append("--runner") command.append("--runner")
command.append(self.west_runner) command.append(self.suite.west_runner)
# There are three ways this option is used. # There are three ways this option is used.
# 1) bare: --west-flash # 1) bare: --west-flash
# This results in options.west_flash == [] # This results in options.west_flash == []
@ -544,9 +542,9 @@ class DeviceHandler(Handler):
# This results in options.west_flash == "--board-id=42" # This results in options.west_flash == "--board-id=42"
# 3) Multiple values: --west-flash="--board-id=42,--erase" # 3) Multiple values: --west-flash="--board-id=42,--erase"
# This results in options.west_flash == "--board-id=42 --erase" # This results in options.west_flash == "--board-id=42 --erase"
if self.west_flash != []: if self.suite.west_flash != []:
command.append('--') command.append('--')
command.extend(self.west_flash.split(',')) command.extend(self.suite.west_flash.split(','))
else: else:
command = [self.generator_cmd, "-C", self.build_dir, "flash"] command = [self.generator_cmd, "-C", self.build_dir, "flash"]
@ -1799,8 +1797,6 @@ class ProjectBuilder(FilterBuilder):
self.cleanup = kwargs.get('cleanup', False) self.cleanup = kwargs.get('cleanup', False)
self.coverage = kwargs.get('coverage', False) self.coverage = kwargs.get('coverage', False)
self.inline_logs = kwargs.get('inline_logs', False) self.inline_logs = kwargs.get('inline_logs', False)
self.west_flash = kwargs.get('west_flash', None)
self.west_runner = kwargs.get('west_runner', None)
self.generator = kwargs.get('generator', None) self.generator = kwargs.get('generator', None)
self.generator_cmd = kwargs.get('generator_cmd', None) self.generator_cmd = kwargs.get('generator_cmd', None)
self.verbose = kwargs.get('verbose', None) self.verbose = kwargs.get('verbose', None)
@ -2740,8 +2736,6 @@ class TestSuite:
cleanup=self.cleanup, cleanup=self.cleanup,
valgrind=self.enable_valgrind, valgrind=self.enable_valgrind,
inline_logs=self.inline_logs, inline_logs=self.inline_logs,
west_flash=self.west_flash,
west_runner=self.west_runner,
generator=self.generator, generator=self.generator,
generator_cmd=self.generator_cmd, generator_cmd=self.generator_cmd,
verbose=self.verbose verbose=self.verbose