diff options
| -rw-r--r-- | googlemock/test/gmock_output_test_golden.txt | 1 | ||||
| -rw-r--r-- | googletest/include/gtest/internal/gtest-type-util.h | 6 | ||||
| -rw-r--r-- | googletest/test/gtest_unittest.cc | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/googlemock/test/gmock_output_test_golden.txt b/googlemock/test/gmock_output_test_golden.txt index f1e0a32..ca88af0 100644 --- a/googlemock/test/gmock_output_test_golden.txt +++ b/googlemock/test/gmock_output_test_golden.txt @@ -310,6 +310,7 @@ FILE:#: Failure Value of: (std::pair<int, bool>(42, true)) Expected: is pair (first: is >= 48, second: true) Actual: (42, true) (of type std::pair<int,bool>) + [ FAILED ] GMockOutputTest.PrintsMatcher [ FAILED ] GMockOutputTest.UnexpectedCall [ FAILED ] GMockOutputTest.UnexpectedCallToVoidFunction diff --git a/googletest/include/gtest/internal/gtest-type-util.h b/googletest/include/gtest/internal/gtest-type-util.h index b23ad55..f94cf61 100644 --- a/googletest/include/gtest/internal/gtest-type-util.h +++ b/googletest/include/gtest/internal/gtest-type-util.h @@ -68,8 +68,8 @@ inline std::string CanonicalizeForStdLibVersioning(std::string s) { } } - /* Strip redundant spaces in typename to match MSVC */ - /* For example, std::pair<int, bool> -> std::pair<int,bool> */ + // Strip redundant spaces in typename to match MSVC + // For example, std::pair<int, bool> -> std::pair<int,bool> static const char to_search[] = ", "; static const char replace_str[] = ","; size_t pos = 0; @@ -107,7 +107,7 @@ inline std::string GetTypeName(const std::type_info& type) { // "struct std::pair<int,bool>" when using MSVC vs "std::pair<int, bool>" with // other compilers. std::string s = name; - // Only strip the leading "struct " and "class ", so uses rfind == 0 to + // Only strip the leading "struct " and "class ", so uses rfind == 0 to // ensure that if (s.rfind("struct ", 0) == 0) { s = s.substr(strlen("struct ")); diff --git a/googletest/test/gtest_unittest.cc b/googletest/test/gtest_unittest.cc index eac3540..77d968a 100644 --- a/googletest/test/gtest_unittest.cc +++ b/googletest/test/gtest_unittest.cc @@ -6675,7 +6675,7 @@ TEST(ColoredOutputTest, UsesColorsWhenTermSupportsColors) { SetEnv("TERM", "linux"); // TERM supports colors. EXPECT_TRUE(ShouldUseColor(true)); // Stdout is a TTY. - SetEnv("TERM", "cygwin"); // TERM supports colors. + SetEnv("TERM", "cygwin"); // TERM supports colors. EXPECT_TRUE(ShouldUseColor(true)); // Stdout is a TTY. #endif // GTEST_OS_WINDOWS } |