Browse Source

gtest: Add support for gtest 1.15.0

The gtest 1.15 has slightly different output from the original one that
was used to set up the harness. With this change we support both output
formats.

Fixes #72318

Signed-off-by: Yuval Peress <peress@google.com>
pull/77258/head
Yuval Peress 11 months ago committed by Alberto Escolar
parent
commit
bfb893a0c5
  1. 15
      scripts/pylib/twister/twisterlib/harness.py
  2. 669
      scripts/tests/twister/test_harness.py

15
scripts/pylib/twister/twisterlib/harness.py

@ -596,11 +596,16 @@ class Pytest(Harness): @@ -596,11 +596,16 @@ class Pytest(Harness):
class Gtest(Harness):
ANSI_ESCAPE = re.compile(r'\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])')
TEST_START_PATTERN = r".*\[ RUN \] (?P<suite_name>[a-zA-Z_][a-zA-Z0-9_]*)\.(?P<test_name>[a-zA-Z_][a-zA-Z0-9_]*)"
TEST_PASS_PATTERN = r".*\[ OK \] (?P<suite_name>[a-zA-Z_][a-zA-Z0-9_]*)\.(?P<test_name>[a-zA-Z_][a-zA-Z0-9_]*)"
TEST_SKIP_PATTERN = r".*\[ DISABLED \] (?P<suite_name>[a-zA-Z_][a-zA-Z0-9_]*)\.(?P<test_name>[a-zA-Z_][a-zA-Z0-9_]*)"
TEST_FAIL_PATTERN = r".*\[ FAILED \] (?P<suite_name>[a-zA-Z_][a-zA-Z0-9_]*)\.(?P<test_name>[a-zA-Z_][a-zA-Z0-9_]*)"
FINISHED_PATTERN = r".*\[==========\] Done running all tests\."
_NAME_PATTERN = "[a-zA-Z_][a-zA-Z0-9_]*"
_SUITE_TEST_NAME_PATTERN = f"(?P<suite_name>{_NAME_PATTERN})\\.(?P<test_name>{_NAME_PATTERN})"
TEST_START_PATTERN = f".*\\[ RUN \\] {_SUITE_TEST_NAME_PATTERN}"
TEST_PASS_PATTERN = f".*\\[ OK \\] {_SUITE_TEST_NAME_PATTERN}"
TEST_SKIP_PATTERN = f".*\\[ DISABLED \\] {_SUITE_TEST_NAME_PATTERN}"
TEST_FAIL_PATTERN = f".*\\[ FAILED \\] {_SUITE_TEST_NAME_PATTERN}"
FINISHED_PATTERN = (
".*(?:\\[==========\\] Done running all tests\\.|"
+ "\\[----------\\] Global test environment tear-down)"
)
def __init__(self):
super().__init__()

669
scripts/tests/twister/test_harness.py

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save