Skip to content

twister: allow using west-flash with 'erase' #72563

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 11, 2024
Merged

twister: allow using west-flash with 'erase' #72563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions scripts/pylib/twister/twisterlib/runner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,17 +501,11 @@ def parse_generated(self, filter_stages=[]):
if self.testsuite.sysbuild and self.env.options.device_testing:
# Verify that twister's arguments support sysbuild.
# Twister sysbuild flashing currently only works with west, so
# --west-flash must be passed. Additionally, erasing the DUT
# before each test with --west-flash=--erase will inherently not
# work with sysbuild.
# --west-flash must be passed.
if self.env.options.west_flash is None:
logger.warning("Sysbuild test will be skipped. " +
"West must be used for flashing.")
return {os.path.join(self.platform.name, self.testsuite.name): True}
elif "--erase" in self.env.options.west_flash:
logger.warning("Sysbuild test will be skipped, " +
"--erase is not supported with --west-flash")
return {os.path.join(self.platform.name, self.testsuite.name): True}

if self.testsuite and self.testsuite.filter:
try:
Expand Down
16 changes: 1 addition & 15 deletions scripts/tests/twister/test_runner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -554,20 +554,6 @@ def mock_popen(*args, **kwargs):
['Sysbuild test will be skipped. West must be used for flashing.'],
{os.path.join('other', 'dummy.testsuite.name'): True}
),
(
'other', ['other'], True,
False, ['--erase'], True,
'Dummy parse results', True,
None,
None,
{},
{},
None,
b'dummy edt pickle contents',
['Sysbuild test will be skipped,' \
' --erase is not supported with --west-flash'],
{os.path.join('other', 'dummy.testsuite.name'): True}
),
(
'other', ['other'], False,
True, None, False,
Expand Down Expand Up @@ -651,7 +637,7 @@ def mock_popen(*args, **kwargs):
' expected_logs, expected_return',
TESTDATA_3,
ids=['unit testing', 'domain', 'kconfig', 'no cache',
'no west options', 'erase west flash option', 'no edt',
'no west options', 'no edt',
'parse result', 'no parse result', 'no testsuite filter', 'parse err']
)
def test_filterbuilder_parse_generated(
Expand Down