Skip to content

Commit 1e471eb

Browse files
jeremybettiscarlescufi
authored andcommitted
twister: Switch to a non-greedy regex
When parsing test names from symbol names, use a non-greedy match to avoid parsing test names with __ in them. The symbol looks like z_ztest_unit_test__SUITE__TEST. It is more likely that a test name will contain __ than a suite name, so now something z_ztest_unit_test__a_b__c_d__e_f will be parsed as suite:a_b test:c_d__e_f, whereas it used to be parsed as suite:a_b__c_d test:e_f Signed-off-by: Jeremy Bettis <[email protected]>
1 parent 1d9ce86 commit 1e471eb

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

scripts/pylib/twister/twisterlib/runner.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -684,7 +684,7 @@ def determine_testcases(self, results):
684684
elf = ELFFile(open(elf_file, "rb"))
685685

686686
logger.debug(f"Test instance {self.instance.name} already has {len(self.instance.testcases)} cases.")
687-
new_ztest_unit_test_regex = re.compile(r"z_ztest_unit_test__([^\s]*)__([^\s]*)")
687+
new_ztest_unit_test_regex = re.compile(r"z_ztest_unit_test__([^\s]+?)__([^\s]*)")
688688
detected_cases = []
689689
for section in elf.iter_sections():
690690
if isinstance(section, SymbolTableSection):

0 commit comments

Comments
 (0)