From 01f9c536ce5a2ccd719c0d9858653c7b53547ec0 Mon Sep 17 00:00:00 2001 From: Kevin Puetz Date: Mon, 30 Mar 2020 19:21:23 -0500 Subject: [PATCH 1/2] googletest-output-test: fix RemoveTestCounts for non-golden platforms This seems to have been missed when renaming "test cases" -> "test suites" in 3a460a26b7a91abf87af7f31b93d29f930e25c82. Presumably no such platform is regularly tested... --- googletest/test/googletest-output-test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/googletest/test/googletest-output-test.py b/googletest/test/googletest-output-test.py index 6d80d532..1f36bc34 100755 --- a/googletest/test/googletest-output-test.py +++ b/googletest/test/googletest-output-test.py @@ -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) From a7890fc76b45a46183c575329819c7f92d6a4fa5 Mon Sep 17 00:00:00 2001 From: Kevin Puetz Date: Wed, 6 May 2020 10:07:37 -0500 Subject: [PATCH 2/2] InitGoogleMockTest.ParsesMultipleFlags was using wchar_t This seems like an inadvertent copy&paste error duplicating WideInitGoogleMockTest.ParsesMultipleFlags --- googlemock/test/gmock_test.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/googlemock/test/gmock_test.cc b/googlemock/test/gmock_test.cc index 8cfff306..510ea5ed 100644 --- a/googlemock/test/gmock_test.cc +++ b/googlemock/test/gmock_test.cc @@ -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));