Condition some code on !GTEST_HAS_MUTEX_AND_THREAD_LOCAL_

git-svn-id: http://googletest.googlecode.com/svn/trunk@730 861a406c-534a-0410-8894-cb66d6ee9925

1 files changed, 9 insertions, 0 deletions

diff --git a/test/gtest-port_test.cc b/test/gtest-port_test.cc
index 7647859..937832b 100644
--- a/test/gtest-port_test.cc
+++ b/test/gtest-port_test.cc
@@ -1149,6 +1149,13 @@ TEST(ThreadLocalTest, ParameterizedConstructorSetsDefault) {
   EXPECT_STREQ("foo", result.c_str());
 }
 
+# if !GTEST_HAS_MUTEX_AND_THREAD_LOCAL_
+
+// Tests in this section depend on that Google Test's own ThreadLocal
+// implementation stores a copy of the default value shared by all
+// threads.  We don't want to test this for an external implementation received
+// through GTEST_HAS_MUTEX_AND_THREAD_LOCAL_.
+
 // Keeps track of whether of destructors being called on instances of
 // DestructorTracker.  On Windows, waits for the destructor call reports.
 class DestructorCall {
@@ -1289,6 +1296,8 @@ TEST(ThreadLocalTest, DestroysManagedObjectAtThreadExit) {
   DestructorCall::ResetList();
 }
 
+# endif  // !GTEST_HAS_MUTEX_AND_THREAD_LOCAL_
+
 TEST(ThreadLocalTest, ThreadLocalMutationsAffectOnlyCurrentThread) {
   ThreadLocal<std::string> thread_local_string;
   thread_local_string.set("Foo");