summaryrefslogtreecommitdiff
path: root/test/gtest-typed-test_test.cc
diff options
context:
space:
mode:
authorzhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925>2010-03-04 22:15:53 +0000
committerzhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925>2010-03-04 22:15:53 +0000
commitf6fb532f0825024feda89c863e33a51b6ff377f5 (patch)
tree9a7a9aac24a5946d5bca4e04ec681ecd38b6199c /test/gtest-typed-test_test.cc
parent2b608176ebb3ae26cd536dbb5809d6941affec33 (diff)
downloadgoogletest-f6fb532f0825024feda89c863e33a51b6ff377f5.tar.gz
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).
git-svn-id: http://googletest.googlecode.com/svn/trunk@386 861a406c-534a-0410-8894-cb66d6ee9925
Diffstat (limited to 'test/gtest-typed-test_test.cc')
-rw-r--r--test/gtest-typed-test_test.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/test/gtest-typed-test_test.cc b/test/gtest-typed-test_test.cc
index 4b6e971..f2c3972 100644
--- a/test/gtest-typed-test_test.cc
+++ b/test/gtest-typed-test_test.cc
@@ -349,12 +349,12 @@ INSTANTIATE_TYPED_TEST_CASE_P(My, NumericTest, NumericTypes);
#if !defined(GTEST_HAS_TYPED_TEST) && !defined(GTEST_HAS_TYPED_TEST_P)
-// Google Test doesn't support type-parameterized tests 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 type-parameterized tests 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, TypedTestsAreNotSupportedOnThisPlatform) {}
#endif // #if !defined(GTEST_HAS_TYPED_TEST) && !defined(GTEST_HAS_TYPED_TEST_P)