michaelh/zephyr
1
0
Fork 0
Code Releases Activity

twister: debug: change skipped -> filtered

Browse source 
Change debug message to say filtered instead of skipped.

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2024-12-10 15:54:30 -05:00 • committed by Benjamin Cabé
commit 82f7857a94
4 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/pylib/twister/twisterlib/twister_main.py
View file

@ -147,7 +147,7 @@ def main(options: argparse.Namespace, default_options: argparse.Namespace):
continue continue
logger.debug( logger.debug(
f"{i.platform.name:<25} {i.testsuite.name:<50}" f"{i.platform.name:<25} {i.testsuite.name:<50}"
f" {Fore.YELLOW}SKIPPED{Fore.RESET}: {i.reason}" f" {Fore.YELLOW}FILTERED{Fore.RESET}: {i.reason}"
) )
report = Reporting(tplan, env) report = Reporting(tplan, env)

28
scripts/tests/twister_blackbox/test_filter.py
View file

@ -24,47 +24,47 @@ class TestFilter:
( (
'x86', 'x86',
[ [
r'(it8xxx2_evb/it81302bx).*?(SKIPPED: Command line testsuite arch filter)', r'(it8xxx2_evb/it81302bx).*?(FILTERED: Command line testsuite arch filter)',
], ],
), ),
( (
'arm', 'arm',
[ [
r'(it8xxx2_evb/it81302bx).*?(SKIPPED: Command line testsuite arch filter)', r'(it8xxx2_evb/it81302bx).*?(FILTERED: Command line testsuite arch filter)',
r'(qemu_x86/atom).*?(SKIPPED: Command line testsuite arch filter)', r'(qemu_x86/atom).*?(FILTERED: Command line testsuite arch filter)',
r'(hsdk/arc_hsdk).*?(SKIPPED: Command line testsuite arch filter)', r'(hsdk/arc_hsdk).*?(FILTERED: Command line testsuite arch filter)',
] ]
), ),
( (
'riscv', 'riscv',
[ [
r'(qemu_x86/atom).*?(SKIPPED: Command line testsuite arch filter)', r'(qemu_x86/atom).*?(FILTERED: Command line testsuite arch filter)',
r'(hsdk/arc_hsdk).*?(SKIPPED: Command line testsuite arch filter)', ] r'(hsdk/arc_hsdk).*?(FILTERED: Command line testsuite arch filter)', ]
) )
] ]
TESTDATA_2 = [ TESTDATA_2 = [
( (
'nxp', 'nxp',
[ [
r'(it8xxx2_evb/it81302bx).*?(SKIPPED: Not a selected vendor platform)', r'(it8xxx2_evb/it81302bx).*?(FILTERED: Not a selected vendor platform)',
r'(hsdk/arc_hsdk).*?(SKIPPED: Not a selected vendor platform)', r'(hsdk/arc_hsdk).*?(FILTERED: Not a selected vendor platform)',
r'(qemu_x86).*?(SKIPPED: Not a selected vendor platform)', r'(qemu_x86).*?(FILTERED: Not a selected vendor platform)',
], ],
), ),
( (
'intel', 'intel',
[ [
r'(it8xxx2_evb/it81302bx).*?(SKIPPED: Not a selected vendor platform)', r'(it8xxx2_evb/it81302bx).*?(FILTERED: Not a selected vendor platform)',
r'(qemu_x86/atom).*?(SKIPPED: Not a selected vendor platform)', r'(qemu_x86/atom).*?(FILTERED: Not a selected vendor platform)',
r'(DEBUG\s+- adding intel_adl_crb)' r'(DEBUG\s+- adding intel_adl_crb)'
] ]
), ),
( (
'ite', 'ite',
[ [
r'(qemu_x86/atom).*?(SKIPPED: Not a selected vendor platform)', r'(qemu_x86/atom).*?(FILTERED: Not a selected vendor platform)',
r'(intel_adl_crb/alder_lake).*?(SKIPPED: Not a selected vendor platform)', r'(intel_adl_crb/alder_lake).*?(FILTERED: Not a selected vendor platform)',
r'(hsdk/arc_hsdk).*?(SKIPPED: Not a selected vendor platform)', r'(hsdk/arc_hsdk).*?(FILTERED: Not a selected vendor platform)',
r'(DEBUG\s+- adding it8xxx2_evb)' r'(DEBUG\s+- adding it8xxx2_evb)'
] ]
) )

12
scripts/tests/twister_blackbox/test_quarantine.py
View file

@ -89,26 +89,26 @@ class TestQuarantine:
sys.stdout.write(out) sys.stdout.write(out)
sys.stderr.write(err) sys.stderr.write(err)
board1_match1 = re.search('agnostic/group2/dummy.agnostic.group2 SKIPPED: Quarantine: test ' board1_match1 = re.search('agnostic/group2/dummy.agnostic.group2 FILTERED: Quarantine: test '
'intel_adl_crb', err) 'intel_adl_crb', err)
board1_match2 = re.search( board1_match2 = re.search(
'agnostic/group1/subgroup2/dummy.agnostic.group1.subgroup2 SKIPPED: Quarantine: test ' 'agnostic/group1/subgroup2/dummy.agnostic.group1.subgroup2 FILTERED: Quarantine: test '
'intel_adl_crb', 'intel_adl_crb',
err) err)
qemu_64_match = re.search( qemu_64_match = re.search(
'agnostic/group1/subgroup2/dummy.agnostic.group1.subgroup2 SKIPPED: Quarantine: test ' 'agnostic/group1/subgroup2/dummy.agnostic.group1.subgroup2 FILTERED: Quarantine: test '
'qemu_x86_64', 'qemu_x86_64',
err) err)
all_platforms_match = re.search( all_platforms_match = re.search(
'agnostic/group1/subgroup1/dummy.agnostic.group1.subgroup1 SKIPPED: Quarantine: test ' 'agnostic/group1/subgroup1/dummy.agnostic.group1.subgroup1 FILTERED: Quarantine: test '
'all platforms', 'all platforms',
err) err)
all_platforms_match2 = re.search( all_platforms_match2 = re.search(
'agnostic/group1/subgroup1/dummy.agnostic.group1.subgroup1 SKIPPED: Quarantine: test ' 'agnostic/group1/subgroup1/dummy.agnostic.group1.subgroup1 FILTERED: Quarantine: test '
'all platforms', 'all platforms',
err) err)
all_platforms_match3 = re.search( all_platforms_match3 = re.search(
'agnostic/group1/subgroup1/dummy.agnostic.group1.subgroup1 SKIPPED: Quarantine: test ' 'agnostic/group1/subgroup1/dummy.agnostic.group1.subgroup1 FILTERED: Quarantine: test '
'all platforms', 'all platforms',
err) err)

8
scripts/tests/twister_blackbox/test_runner.py
View file

@ -128,9 +128,9 @@ class TestRunner:
os.path.join(TEST_DATA, 'tests', 'dummy'), os.path.join(TEST_DATA, 'tests', 'dummy'),
['qemu_x86/atom'], ['qemu_x86/atom'],
['device'], ['device'],
['dummy.agnostic.group2 SKIPPED: Command line testsuite tag filter', ['dummy.agnostic.group2 FILTERED: Command line testsuite tag filter',
'dummy.agnostic.group1.subgroup2 SKIPPED: Command line testsuite tag filter', 'dummy.agnostic.group1.subgroup2 FILTERED: Command line testsuite tag filter',
'dummy.agnostic.group1.subgroup1 SKIPPED: Command line testsuite tag filter', 'dummy.agnostic.group1.subgroup1 FILTERED: Command line testsuite tag filter',
r'0 of 0 executed test configurations passed \(0.00%\), 0 built \(not run\), 0 failed, 0 errored' r'0 of 0 executed test configurations passed \(0.00%\), 0 built \(not run\), 0 failed, 0 errored'
] ]
), ),
@ -138,7 +138,7 @@ class TestRunner:
os.path.join(TEST_DATA, 'tests', 'dummy'), os.path.join(TEST_DATA, 'tests', 'dummy'),
['qemu_x86/atom'], ['qemu_x86/atom'],
['subgrouped'], ['subgrouped'],
['dummy.agnostic.group2 SKIPPED: Command line testsuite tag filter', ['dummy.agnostic.group2 FILTERED: Command line testsuite tag filter',
r'1 of 2 executed test configurations passed \(50.00%\), 1 built \(not run\), 0 failed, 0 errored' r'1 of 2 executed test configurations passed \(50.00%\), 1 built \(not run\), 0 failed, 0 errored'
] ]
), ),