organicmaps/googletest
13
Fork 0
mirror of https://github.com/google/googletest.git synced 2025-04-04 21:15:03 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

Merge a7890fc76b into 52204f78f9

Browse source
This commit is contained in:
Kevin Puetz 2025-03-30 13:32:49 +00:00 • committed by GitHub
commit 346f898a20
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
googlemock/test/gmock_test.cc
View file

@ -87,10 +87,10 @@ TEST(InitGoogleMockTest, ParsesSingleFlag) {
TEST(InitGoogleMockTest, ParsesMultipleFlags) {
int old_default_behavior = GMOCK_FLAG_GET(default_mock_behavior);
const wchar_t* argv[] = {L"foo.exe", L"--gmock_verbose=info",
L"--gmock_default_mock_behavior=2", nullptr};
const char* argv[] = {"foo.exe", "--gmock_verbose=info",
"--gmock_default_mock_behavior=2", nullptr};
const wchar_t* new_argv[] = {L"foo.exe", nullptr};
const char* new_argv[] = {"foo.exe", nullptr};
TestInitGoogleMock(argv, new_argv, "info");
EXPECT_EQ(2, GMOCK_FLAG_GET(default_mock_behavior));

2
googletest/test/googletest-output-test.py
View file

@ -175,7 +175,7 @@ def RemoveTestCounts(output):
output = re.sub(r'\d+ tests?, listed below', '? tests, listed below', output)
output = re.sub(r'\d+ FAILED TESTS', '? FAILED TESTS', output)
output = re.sub(
r'\d+ tests? from \d+ test cases?', '? tests from ? test cases', output
r'\d+ tests? from \d+ test suites?', '? tests from ? test suites', output
)
output = re.sub(r'\d+ tests? from ([a-zA-Z_])', r'? tests from \1', output)
return re.sub(r'\d+ tests?\.', '? tests.', output)