diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-09-20 18:30:26 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-20 18:30:26 (GMT) |
| commit | 90943525c5d1fa4362cbc5c4b313dab761c02295 (patch) | |
| tree | ffef3579c23a986ad65dab298550d62e6302cd00 /googletest/test | |
| parent | 149c0d24148da9a339d6c9d03e638a39c59731f6 (diff) | |
| parent | 258def01a68e3a4d080fee6d4502035218e61e38 (diff) | |
| download | googletest-90943525c5d1fa4362cbc5c4b313dab761c02295.zip googletest-90943525c5d1fa4362cbc5c4b313dab761c02295.tar.gz googletest-90943525c5d1fa4362cbc5c4b313dab761c02295.tar.bz2 | |
Merge branch 'master' into python3-tests
Diffstat (limited to 'googletest/test')
| -rw-r--r-- | googletest/test/googletest-printers-test.cc | 16 | ||||
| -rw-r--r-- | googletest/test/gtest_unittest.cc | 2 |
2 files changed, 17 insertions, 1 deletions
diff --git a/googletest/test/googletest-printers-test.cc b/googletest/test/googletest-printers-test.cc index ea8369d..6e26274 100644 --- a/googletest/test/googletest-printers-test.cc +++ b/googletest/test/googletest-printers-test.cc @@ -1112,9 +1112,25 @@ TEST(PrintStdTupleTest, NestedTuple) { #endif // GTEST_LANG_CXX11 #if GTEST_LANG_CXX11 + TEST(PrintNullptrT, Basic) { EXPECT_EQ("(nullptr)", Print(nullptr)); } + +TEST(PrintReferenceWrapper, Printable) { + int x = 5; + EXPECT_EQ("5", Print(std::ref(x))); + EXPECT_EQ("5", Print(std::cref(x))); +} + +TEST(PrintReferenceWrapper, Unprintable) { + ::foo::UnprintableInFoo up; + EXPECT_EQ("16-byte object <EF-12 00-00 34-AB 00-00 00-00 00-00 00-00 00-00>", + Print(std::ref(up))); + EXPECT_EQ("16-byte object <EF-12 00-00 34-AB 00-00 00-00 00-00 00-00 00-00>", + Print(std::cref(up))); +} + #endif // GTEST_LANG_CXX11 // Tests printing user-defined unprintable types. diff --git a/googletest/test/gtest_unittest.cc b/googletest/test/gtest_unittest.cc index 701ba20..c03b367 100644 --- a/googletest/test/gtest_unittest.cc +++ b/googletest/test/gtest_unittest.cc @@ -6826,7 +6826,7 @@ TEST(ColoredOutputTest, UsesColorsWhenStdoutIsTty) { TEST(ColoredOutputTest, UsesColorsWhenTermSupportsColors) { GTEST_FLAG(color) = "auto"; -#if GTEST_OS_WINDOWS +#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MINGW // On Windows, we ignore the TERM variable as it's usually not set. SetEnv("TERM", "dumb"); |