Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(757)

Unified Diff: tests/PathOpsExtendedTest.cpp

Issue 25713004: Sadly TSAN still reports this as a race, even when we're obviously writing the (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/PathOpsExtendedTest.cpp
diff --git a/tests/PathOpsExtendedTest.cpp b/tests/PathOpsExtendedTest.cpp
index c3162abcc973a670d6039679ce02e9dac9ebe41a..28830ed702280ea585a3d72a749b1923fcd801ab 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;
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698