michaelh/zephyr
1
0
Fork 0
Code Releases Activity

twister: Fix gtest harness

Browse source 
Some platforms prefix extra logging information before the standard
[] blocks so I've added `.\*` to the regex. Also, removed the static
values so they're only referenced using 'self.' and stopped parsing
lines after the FINISHED_PATTERN is matched since some versions of
gTest also print out a test summary after and it's not useful for
the processing.

Signed-off-by: Yuval Peress <peress@google.com>
This commit is contained in:
Yuval Peress 2023-11-06 13:48:51 -07:00 • committed by Anas Nashif
commit 6bd0b54526
1 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
scripts/pylib/twister/twisterlib/harness.py
View file

@ -450,17 +450,23 @@ class Pytest(Harness):
class Gtest(Harness): class Gtest(Harness):
ANSI_ESCAPE = re.compile(r'\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])') ANSI_ESCAPE = re.compile(r'\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])')
TEST_START_PATTERN = r"\[ RUN \] (?P<suite_name>.*)\.(?P<test_name>.*)$" TEST_START_PATTERN = r".*\[ RUN \] (?P<suite_name>.*)\.(?P<test_name>.*)$"
TEST_PASS_PATTERN = r"\[ OK \] (?P<suite_name>.*)\.(?P<test_name>.*)$" TEST_PASS_PATTERN = r".*\[ OK \] (?P<suite_name>.*)\.(?P<test_name>.*)$"
TEST_FAIL_PATTERN = r"\[ FAILED \] (?P<suite_name>.*)\.(?P<test_name>.*)$" TEST_FAIL_PATTERN = r".*\[ FAILED \] (?P<suite_name>.*)\.(?P<test_name>.*)$"
FINISHED_PATTERN = r"\[==========\] Done running all tests\.$" FINISHED_PATTERN = r".*\[==========\] Done running all tests\.$"
has_failures = False
tc = None def __init__(self):
super().__init__()
self.tc = None
self.has_failures = False
def handle(self, line): def handle(self, line):
# Strip the ANSI characters, they mess up the patterns # Strip the ANSI characters, they mess up the patterns
non_ansi_line = self.ANSI_ESCAPE.sub('', line) non_ansi_line = self.ANSI_ESCAPE.sub('', line)
if self.state:
return
# Check if we started running a new test # Check if we started running a new test
test_start_match = re.search(self.TEST_START_PATTERN, non_ansi_line) test_start_match = re.search(self.TEST_START_PATTERN, non_ansi_line)
if test_start_match: if test_start_match: