diff options
author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2010-03-04 22:15:53 (GMT) |
---|---|---|
committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2010-03-04 22:15:53 (GMT) |
commit | 12a92c26fc0e0de81f687dbe739a6aa24f37f9dd (patch) | |
tree | 9a7a9aac24a5946d5bca4e04ec681ecd38b6199c /samples/sample8_unittest.cc | |
parent | 0928f00c6b995af037b787b710fde509267ad624 (diff) | |
download | googletest-12a92c26fc0e0de81f687dbe739a6aa24f37f9dd.zip googletest-12a92c26fc0e0de81f687dbe739a6aa24f37f9dd.tar.gz googletest-12a92c26fc0e0de81f687dbe739a6aa24f37f9dd.tar.bz2 |
Renames ThreadStartSempahore to Notificaton (by Vlad Losev); adds threading tests for SCOPED_TRACE() (by Vlad Losev); replaces native pthread calls with gtest's threading constructs (by Vlad Losev); fixes flakiness in CountedDestructor (by Vlad Losev); minor MSVC 7.1 clean-up (by Zhanyong Wan).
Diffstat (limited to 'samples/sample8_unittest.cc')
-rw-r--r-- | samples/sample8_unittest.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/samples/sample8_unittest.cc b/samples/sample8_unittest.cc index d76136a..ccf61d9 100644 --- a/samples/sample8_unittest.cc +++ b/samples/sample8_unittest.cc @@ -162,12 +162,12 @@ INSTANTIATE_TEST_CASE_P(MeaningfulTestParameters, #else -// Google Test doesn't support Combine() on some platforms and compilers, -// such as MSVC 7.1. If we use conditional compilation to compile out -// all code referring to the gtest_main library, MSVC linker will not -// link that library at all and consequently complain about missing entry -// point defined in that library (fatal error LNK1561: entry point must -// be defined). This dummy test keeps gtest_main linked in. +// Google Test may not support Combine() with some compilers. If we +// use conditional compilation to compile out all code referring to +// the gtest_main library, MSVC linker will not link that library at +// all and consequently complain about missing entry point defined in +// that library (fatal error LNK1561: entry point must be +// defined). This dummy test keeps gtest_main linked in. TEST(DummyTest, CombineIsNotSupportedOnThisPlatform) {} #endif // GTEST_HAS_COMBINE |