diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-02 16:15:44 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-02 16:15:44 +0000 |
| commit | 409774e8accb8772765b376d3126209b198bc87c (patch) | |
| tree | 2ecb33675a8edf113561bc61470fc37422e04092 /tests/PathOpsExtendedTest.cpp | |
| parent | 354fd97ee00d2b604bf72132b7449b32a88dc2db (diff) | |
Sadly TSAN still reports this as a race, even when we're obviously writing the
same values. Initializing with the declaration should quiet it down.
BUG=
R=caryclark@google.com
Author: mtklein@google.com
Review URL: https://codereview.chromium.org/25713004
git-svn-id: http://skia.googlecode.com/svn/trunk@11574 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'tests/PathOpsExtendedTest.cpp')
| -rw-r--r-- | tests/PathOpsExtendedTest.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/tests/PathOpsExtendedTest.cpp b/tests/PathOpsExtendedTest.cpp index c3162abcc9..28830ed702 100644 --- a/tests/PathOpsExtendedTest.cpp +++ b/tests/PathOpsExtendedTest.cpp @@ -447,8 +447,9 @@ static int comparePaths(skiatest::Reporter* reporter, const SkPath& one, const S return errors2x2 > MAX_ERRORS ? errors2x2 : 0; } -static int testNumber; -static const char* testName; +// Default values for when reporter->verbose() is false. +static int testNumber = 1; +static const char* testName = "pathOpTest"; static void writeTestName(const char* nameSuffix, SkMemoryWStream& outFile) { outFile.writeText(testName); @@ -655,9 +656,6 @@ int initializeTests(skiatest::Reporter* reporter, const char* test) { testNumber = atoi(numLoc) + 1; } } - } else { - testName = "pathOpTest"; - testNumber = 1; } return reporter->allowThreaded() ? SkThreadPool::kThreadPerCore : 1; } |