michaelh/zephyr
1
0
Fork 0
Code Releases Activity

twister: testplan: do not error on missing or unsatisfied env

Browse source 
bsim requires a special setup for it to be usuable and run by twister.
If this environment is not available, we should not error when the
platform is an integration platform.

Most developers and users of twister will not have the babblesim setup
and reporting errors is misleading and confusing. So if such env. is not
available, just filter as usual and do not error.

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2024-11-30 09:41:12 -05:00
commit e873d503a9
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
scripts/pylib/twister/twisterlib/testplan.py
View file

@ -69,8 +69,10 @@ class Filters:
SKIP = 'Skip filter' SKIP = 'Skip filter'
# in case of incompatibility between selected and allowed toolchains. # in case of incompatibility between selected and allowed toolchains.
TOOLCHAIN = 'Toolchain filter' TOOLCHAIN = 'Toolchain filter'
# in case an optional module is not available # in case where an optional module is not available
MODULE = 'Module filter' MODULE = 'Module filter'
# in case of missing env. variable required for a platform
ENVIRONMENT = 'Environment filter'
class TestLevel: class TestLevel:
@ -1017,7 +1019,7 @@ class TestPlan:
if not plat.env_satisfied: if not plat.env_satisfied:
instance.add_filter( instance.add_filter(
"Environment ({}) not satisfied".format(", ".join(plat.env)), "Environment ({}) not satisfied".format(", ".join(plat.env)),
Filters.PLATFORM Filters.ENVIRONMENT
) )
if not force_toolchain \ if not force_toolchain \
@ -1316,7 +1318,7 @@ def change_skip_to_error_if_integration(options, instance):
filters = {t['type'] for t in instance.filters} filters = {t['type'] for t in instance.filters}
ignore_filters ={Filters.CMD_LINE, Filters.SKIP, Filters.PLATFORM_KEY, ignore_filters ={Filters.CMD_LINE, Filters.SKIP, Filters.PLATFORM_KEY,
Filters.TOOLCHAIN, Filters.MODULE, Filters.TESTPLAN, Filters.TOOLCHAIN, Filters.MODULE, Filters.TESTPLAN,
Filters.QUARANTINE} Filters.QUARANTINE, Filters.ENVIRONMENT}
if filters.intersection(ignore_filters): if filters.intersection(ignore_filters):
return return
instance.status = TwisterStatus.ERROR instance.status = TwisterStatus.ERROR