clean up tests
Confirm that no path ops tests are flaky, and clean up errors around
that. The test framework was incorrectly checking for >= MAX_ERRORS for
failure and <= MAX_ERRORS for success.
TBR=reed@google.com
Review URL: https://codereview.chromium.org/1140563003
diff --git a/tests/PathOpsExtendedTest.cpp b/tests/PathOpsExtendedTest.cpp
index d2a6777..a8079cf 100644
--- a/tests/PathOpsExtendedTest.cpp
+++ b/tests/PathOpsExtendedTest.cpp
@@ -322,16 +322,16 @@
}
SK_DECLARE_STATIC_MUTEX(compareDebugOut3);
-SK_DECLARE_STATIC_MUTEX(compareDebugOut4);
+
static int comparePaths(skiatest::Reporter* reporter, const char* testName, const SkPath& one,
const SkPath& scaledOne, const SkPath& two, const SkPath& scaledTwo, SkBitmap& bitmap,
const SkPath& a, const SkPath& b, const SkPathOp shapeOp, const SkMatrix& scale,
- bool expectSuccess, bool flaky) {
+ bool expectSuccess) {
int errors2x2;
const int MAX_ERRORS = 8;
(void) pathsDrawTheSame(bitmap, scaledOne, scaledTwo, errors2x2);
if (!expectSuccess) {
- if (errors2x2 <= MAX_ERRORS && !flaky) {
+ if (errors2x2 < MAX_ERRORS) {
REPORTER_ASSERT(reporter, 0);
}
return 0;
@@ -339,20 +339,14 @@
if (errors2x2 == 0) {
return 0;
}
- if (flaky) {
- return 0;
- }
- if (errors2x2 > MAX_ERRORS) {
+ if (errors2x2 >= MAX_ERRORS) {
SkAutoMutexAcquire autoM(compareDebugOut3);
showPathOpPath(testName, one, two, a, b, scaledOne, scaledTwo, shapeOp, scale);
SkDebugf("\n/*");
REPORTER_ASSERT(reporter, 0);
SkDebugf(" */\n");
- } else if (errors2x2 == MAX_ERRORS || errors2x2 == MAX_ERRORS - 1) {
- SkAutoMutexAcquire autoM(compareDebugOut4);
- showPathOpPath(testName, one, two, a, b, scaledOne, scaledTwo, shapeOp, scale);
}
- return errors2x2 > MAX_ERRORS ? errors2x2 : 0;
+ return errors2x2 >= MAX_ERRORS ? errors2x2 : 0;
}
// Default values for when reporter->verbose() is false.
@@ -498,8 +492,7 @@
bool OpDebug(const SkPath& one, const SkPath& two, SkPathOp op, SkPath* result, bool expectSuccess);
static bool innerPathOp(skiatest::Reporter* reporter, const SkPath& a, const SkPath& b,
- const SkPathOp shapeOp, const char* testName, bool threaded, bool expectSuccess,
- bool flaky) {
+ const SkPathOp shapeOp, const char* testName, bool expectSuccess) {
#if 0 && DEBUG_SHOW_TEST_NAME
showName(a, b, shapeOp);
#endif
@@ -537,29 +530,24 @@
scaledOut.addPath(out, scale);
scaledOut.setFillType(out.getFillType());
int result = comparePaths(reporter, testName, pathOut, scaledPathOut, out, scaledOut, bitmap,
- a, b, shapeOp, scale, expectSuccess, flaky);
+ a, b, shapeOp, scale, expectSuccess);
reporter->bumpTestCount();
return result == 0;
}
bool testPathOp(skiatest::Reporter* reporter, const SkPath& a, const SkPath& b,
const SkPathOp shapeOp, const char* testName) {
- return innerPathOp(reporter, a, b, shapeOp, testName, false, true, false);
-}
-
-bool testPathOpFlaky(skiatest::Reporter* reporter, const SkPath& a, const SkPath& b,
- const SkPathOp shapeOp, const char* testName) {
- return innerPathOp(reporter, a, b, shapeOp, testName, false, true, true);
+ return innerPathOp(reporter, a, b, shapeOp, testName, true);
}
bool testPathOpCheck(skiatest::Reporter* reporter, const SkPath& a, const SkPath& b,
const SkPathOp shapeOp, const char* testName, bool checkFail) {
- return innerPathOp(reporter, a, b, shapeOp, testName, false, checkFail, false);
+ return innerPathOp(reporter, a, b, shapeOp, testName, checkFail);
}
bool testPathOpFailCheck(skiatest::Reporter* reporter, const SkPath& a, const SkPath& b,
const SkPathOp shapeOp, const char* testName) {
- return innerPathOp(reporter, a, b, shapeOp, testName, false, false, true);
+ return innerPathOp(reporter, a, b, shapeOp, testName, false);
}
bool testPathFailOp(skiatest::Reporter* reporter, const SkPath& a, const SkPath& b,
@@ -579,11 +567,6 @@
return true;
}
-bool testThreadedPathOp(skiatest::Reporter* reporter, const SkPath& a, const SkPath& b,
- const SkPathOp shapeOp, const char* testName) {
- return innerPathOp(reporter, a, b, shapeOp, testName, true, true, false);
-}
-
SK_DECLARE_STATIC_MUTEX(gMutex);
void initializeTests(skiatest::Reporter* reporter, const char* test) {
diff --git a/tests/PathOpsExtendedTest.h b/tests/PathOpsExtendedTest.h
index 46ee03b..a604761 100644
--- a/tests/PathOpsExtendedTest.h
+++ b/tests/PathOpsExtendedTest.h
@@ -37,12 +37,8 @@
const SkPathOp , const char* testName, bool checkFail);
extern bool testPathOpFailCheck(skiatest::Reporter* reporter, const SkPath& a, const SkPath& b,
const SkPathOp , const char* testName);
-extern bool testPathOpFlaky(skiatest::Reporter* reporter, const SkPath& a, const SkPath& b,
- const SkPathOp , const char* testName);
extern bool testPathFailOp(skiatest::Reporter* reporter, const SkPath& a, const SkPath& b,
const SkPathOp , const char* testName);
-extern bool testThreadedPathOp(skiatest::Reporter* reporter, const SkPath& a, const SkPath& b,
- const SkPathOp , const char* testName);
extern bool testSimplify(SkPath& path, bool useXor, SkPath& out, PathOpsThreadState& state,
const char* pathStr);
extern bool testSimplify(skiatest::Reporter* reporter, const SkPath& path, const char* filename);
diff --git a/tests/PathOpsFuzz763Test.cpp b/tests/PathOpsFuzz763Test.cpp
index f782941..5552573 100755
--- a/tests/PathOpsFuzz763Test.cpp
+++ b/tests/PathOpsFuzz763Test.cpp
@@ -2198,7 +2198,7 @@
path.close();
SkPath path2(path);
- testPathOpFlaky(reporter, path1, path2, (SkPathOp) 2, filename);
+ testPathOp(reporter, path1, path2, (SkPathOp) 2, filename);
}
static void fuzz763_2674194(skiatest::Reporter* reporter, const char* filename) {
diff --git a/tests/PathOpsOpCircleThreadedTest.cpp b/tests/PathOpsOpCircleThreadedTest.cpp
index 73abdec..0bb75cc 100644
--- a/tests/PathOpsOpCircleThreadedTest.cpp
+++ b/tests/PathOpsOpCircleThreadedTest.cpp
@@ -53,7 +53,7 @@
if (progress) {
outputProgress(state.fPathStr, pathStr, (SkPathOp) op);
}
- testThreadedPathOp(state.fReporter, pathA, pathB, (SkPathOp) op, "circles");
+ testPathOp(state.fReporter, pathA, pathB, (SkPathOp) op, "circles");
}
}
}
diff --git a/tests/PathOpsOpCubicThreadedTest.cpp b/tests/PathOpsOpCubicThreadedTest.cpp
index 26617b8..12eb71b 100644
--- a/tests/PathOpsOpCubicThreadedTest.cpp
+++ b/tests/PathOpsOpCubicThreadedTest.cpp
@@ -64,7 +64,7 @@
SkPathOpsDebug::OpStr((SkPathOp) op));
str += sprintf(str, "}\n");
}
- if (!testThreadedPathOp(state.fReporter, pathA, pathB, (SkPathOp) op, "cubics")) {
+ if (!testPathOp(state.fReporter, pathA, pathB, (SkPathOp) op, "cubics")) {
if (progress) {
++loopNo;
goto skipToNext;
diff --git a/tests/PathOpsOpLoopThreadedTest.cpp b/tests/PathOpsOpLoopThreadedTest.cpp
index d8689bf..3f6d081 100755
--- a/tests/PathOpsOpLoopThreadedTest.cpp
+++ b/tests/PathOpsOpLoopThreadedTest.cpp
@@ -85,7 +85,7 @@
if (progress) {
outputProgress(state.fPathStr, pathStr, kIntersect_SkPathOp);
}
- testThreadedPathOp(state.fReporter, pathA, pathB, kIntersect_SkPathOp, "loops");
+ testPathOp(state.fReporter, pathA, pathB, kIntersect_SkPathOp, "loops");
}
}
}
diff --git a/tests/PathOpsOpRectThreadedTest.cpp b/tests/PathOpsOpRectThreadedTest.cpp
index d2fb118..9195e4a 100644
--- a/tests/PathOpsOpRectThreadedTest.cpp
+++ b/tests/PathOpsOpRectThreadedTest.cpp
@@ -71,7 +71,7 @@
if (progress) {
outputProgress(state.fPathStr, pathStr, (SkPathOp) op);
}
- testThreadedPathOp(state.fReporter, pathA, pathB, (SkPathOp) op, "rects");
+ testPathOp(state.fReporter, pathA, pathB, (SkPathOp) op, "rects");
}
}
}