michaelh/zephyr
1
0
Fork 0
Code Releases Activity

twister: plan: unify messaging, testsuite vs testcase

Browse source 
Many places use test case instead of testsuite or testsuite scenario.
Unify to avoid confusion.

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2024-12-11 07:18:00 -05:00 • committed by Benjamin Cabé
commit 63caa67f52
1 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -195,7 +195,7 @@ class TestPlan:
self.add_configurations() self.add_configurations()
num = self.add_testsuites(testsuite_filter=self.run_individual_testsuite) num = self.add_testsuites(testsuite_filter=self.run_individual_testsuite)
if num == 0: if num == 0:
raise TwisterRuntimeError("No test cases found at the specified location...") raise TwisterRuntimeError("No testsuites found at the specified location...")
if self.load_errors: if self.load_errors:
raise TwisterRuntimeError( raise TwisterRuntimeError(
f"Found {self.load_errors} errors loading {num} test configurations." f"Found {self.load_errors} errors loading {num} test configurations."
@ -571,7 +571,7 @@ class TestPlan:
for root in self.env.test_roots: for root in self.env.test_roots:
root = os.path.abspath(root) root = os.path.abspath(root)
logger.debug(f"Reading test case configuration files under {root}...") logger.debug(f"Reading testsuite configuration files under {root}...")
for dirpath, _, filenames in os.walk(root, topdown=True): for dirpath, _, filenames in os.walk(root, topdown=True):
if self.SAMPLE_FILENAME in filenames: if self.SAMPLE_FILENAME in filenames:
@ -800,14 +800,14 @@ class TestPlan:
emulation_platforms = False emulation_platforms = False
if all_filter: if all_filter:
logger.info("Selecting all possible platforms per test case") logger.info("Selecting all possible platforms per testsuite scenario")
# When --all used, any --platform arguments ignored # When --all used, any --platform arguments ignored
platform_filter = [] platform_filter = []
elif not platform_filter and not emu_filter and not vendor_filter: elif not platform_filter and not emu_filter and not vendor_filter:
logger.info("Selecting default platforms per test case") logger.info("Selecting default platforms per testsuite scenario")
default_platforms = True default_platforms = True
elif emu_filter: elif emu_filter:
logger.info("Selecting emulation platforms per test case") logger.info("Selecting emulation platforms per testsuite scenraio")
emulation_platforms = True emulation_platforms = True
elif vendor_filter: elif vendor_filter:
vendor_platforms = True vendor_platforms = True
@ -954,10 +954,10 @@ class TestPlan:
if not force_platform: if not force_platform:
if ts.arch_allow and plat.arch not in ts.arch_allow: if ts.arch_allow and plat.arch not in ts.arch_allow:
instance.add_filter("Not in test case arch allow list", Filters.TESTSUITE) instance.add_filter("Not in testsuite arch allow list", Filters.TESTSUITE)
if ts.arch_exclude and plat.arch in ts.arch_exclude: if ts.arch_exclude and plat.arch in ts.arch_exclude:
instance.add_filter("In test case arch exclude", Filters.TESTSUITE) instance.add_filter("In testsuite arch exclude", Filters.TESTSUITE)
if ts.vendor_allow and plat.vendor not in ts.vendor_allow: if ts.vendor_allow and plat.vendor not in ts.vendor_allow:
instance.add_filter( instance.add_filter(
@ -969,10 +969,10 @@ class TestPlan:
instance.add_filter("In testsuite vendor exclude", Filters.TESTSUITE) instance.add_filter("In testsuite vendor exclude", Filters.TESTSUITE)
if ts.platform_exclude and plat.name in ts.platform_exclude: if ts.platform_exclude and plat.name in ts.platform_exclude:
instance.add_filter("In test case platform exclude", Filters.TESTSUITE) instance.add_filter("In testsuite platform exclude", Filters.TESTSUITE)
if ts.toolchain_exclude and toolchain in ts.toolchain_exclude: if ts.toolchain_exclude and toolchain in ts.toolchain_exclude:
instance.add_filter("In test case toolchain exclude", Filters.TOOLCHAIN) instance.add_filter("In testsuite toolchain exclude", Filters.TOOLCHAIN)
if platform_filter and plat.name not in platform_filter: if platform_filter and plat.name not in platform_filter:
instance.add_filter("Command line platform filter", Filters.CMD_LINE) instance.add_filter("Command line platform filter", Filters.CMD_LINE)
@ -998,7 +998,10 @@ class TestPlan:
and toolchain and (toolchain not in plat.supported_toolchains) \ and toolchain and (toolchain not in plat.supported_toolchains) \
and "host" not in plat.supported_toolchains \ and "host" not in plat.supported_toolchains \
and ts.type != 'unit': and ts.type != 'unit':
instance.add_filter("Not supported by the toolchain", Filters.PLATFORM) instance.add_filter(
f"Not supported by the toolchain: {toolchain}",
Filters.PLATFORM
)
if plat.ram < ts.min_ram: if plat.ram < ts.min_ram:
instance.add_filter("Not enough RAM", Filters.PLATFORM) instance.add_filter("Not enough RAM", Filters.PLATFORM)