commit 57f035ecae1ff8f2b2e0614e0649f0b90c69adad
author commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Oct 01 18:44:04 2013 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Oct 01 18:44:04 2013 +0000
tree 07c69c1dd19902eaa6d068c3f12058e1a491d662
parent f6842e7c7b581ed55e859b37c1081836008393c5

Writing to testName and reading its size isn't thread safe, TSAN reminds us.

Guarding it into a no-op makes it safe.  Looks like this is only used for debugging, presumably singlethreaded?

BUG=
R=caryclark@google.com

Author: mtklein@google.com

Review URL: https://codereview.chromium.org/25366002

git-svn-id: http://skia.googlecode.com/svn/trunk@11562 2bbb7eff-a529-9590-31e7-b0007b416f81

tests/PathOpsExtendedTest.cpp

diff --git a/tests/PathOpsExtendedTest.cpp b/tests/PathOpsExtendedTest.cpp
index efee0fc..c32bfa1 100644
--- a/tests/PathOpsExtendedTest.cpp
+++ b/tests/PathOpsExtendedTest.cpp
@@ -632,6 +632,7 @@
     SkPathOpsDebug::gMaxWindSum = 4;
     SkPathOpsDebug::gMaxWindValue = 4;
 #endif
+#if DEBUG_SHOW_TEST_NAME
     testName = test;
     size_t testNameSize = strlen(test);
     SkFILEStream inFile("../../experimental/Intersection/op.htm");
@@ -648,6 +649,7 @@
             testNumber = atoi(numLoc) + 1;
         }
     }
+#endif
     return reporter->allowThreaded() ? SkThreadPool::kThreadPerCore : 1;
 }