Merge 8f0af4ae52d727ed7d9552921535bd1ec5ed8208 into a0f06a70e3da7afa88da9527c43951bca1f7cef2

This commit is contained in:
Manikandan K S 2026-07-29 15:06:03 -04:00 committed by GitHub
commit fbc8cad4fa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -209,6 +209,24 @@ def NormalizeOutput(output):
"""Normalizes output (the output of googletest-output-test_.exe)."""
output = ToUnixLineEnding(output)
# Normalize the fixture class mismatch message if the platform's linker
# did not deduplicate the type ID of testing::Test across shared library
# boundaries.
output = re.sub(
r'class\. However, in test suite (.*),\n'
r'you defined test (.*) and test (.*)\n'
r'using two different test fixture classes\. This can happen if\n'
r'the two classes are from different namespaces or translation\n'
r'units and have the same name\. You should probably rename one\n'
r'of the classes to put the tests into different test suites\.',
r'class, so mixing TEST_F and TEST in the same test suite is\n'
r'illegal. In test suite \1,\n'
r'test \2 is defined using TEST_F but\n'
r'test \3 is defined using TEST. You probably\n'
r'want to change the TEST to TEST_F or move it to another test\n'
r'case.',
output,
)
output = RemoveLocations(output)
output = RemoveStackTraceDetails(output)
output = RemoveTime(output)