mirror of
https://github.com/google/googletest.git
synced 2026-11-10 07:09:57 +08:00
Merge 8f0af4ae52d727ed7d9552921535bd1ec5ed8208 into cd8e73f067129f8489e35c7b51c7a68552b289d2
This commit is contained in:
commit
e8bc1ed3be
@ -209,6 +209,24 @@ def NormalizeOutput(output):
|
|||||||
"""Normalizes output (the output of googletest-output-test_.exe)."""
|
"""Normalizes output (the output of googletest-output-test_.exe)."""
|
||||||
|
|
||||||
output = ToUnixLineEnding(output)
|
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 = RemoveLocations(output)
|
||||||
output = RemoveStackTraceDetails(output)
|
output = RemoveStackTraceDetails(output)
|
||||||
output = RemoveTime(output)
|
output = RemoveTime(output)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user