| Index: tests/PathOpsExtendedTest.cpp
|
| diff --git a/tests/PathOpsExtendedTest.cpp b/tests/PathOpsExtendedTest.cpp
|
| index c96cbcdae5ff11ddbf2285f9f2a862337d85a44d..b5bf5b8d9f083dba08e926bc17321589e4a62eb3 100644
|
| --- a/tests/PathOpsExtendedTest.cpp
|
| +++ b/tests/PathOpsExtendedTest.cpp
|
| @@ -299,8 +299,6 @@ int comparePaths(skiatest::Reporter* reporter, const char* filename, const SkPat
|
| return errors2x2 > MAX_ERRORS ? errors2x2 : 0;
|
| }
|
|
|
| -const int gTestFirst = 41;
|
| -static int gTestNo = gTestFirst;
|
| static SkTDArray<SkPathOp> gTestOp;
|
|
|
| static void showPathOpPath(const char* testName, const SkPath& one, const SkPath& two,
|
| @@ -310,10 +308,9 @@ static void showPathOpPath(const char* testName, const SkPath& one, const SkPath
|
| if (!testName) {
|
| testName = "xOp";
|
| }
|
| - SkDebugf("static void %s%d%s(skiatest::Reporter* reporter, const char* filename) {\n",
|
| - testName, gTestNo, opSuffixes[shapeOp]);
|
| + SkDebugf("static void %s_%s(skiatest::Reporter* reporter, const char* filename) {\n",
|
| + testName, opSuffixes[shapeOp]);
|
| *gTestOp.append() = shapeOp;
|
| - ++gTestNo;
|
| SkDebugf(" SkPath path, pathB;\n");
|
| SkPathOpsDebug::ShowOnePath(a, "path", false);
|
| SkPathOpsDebug::ShowOnePath(b, "pathB", false);
|
| @@ -322,15 +319,6 @@ static void showPathOpPath(const char* testName, const SkPath& one, const SkPath
|
| drawAsciiPaths(scaledOne, scaledTwo, true);
|
| }
|
|
|
| -void ShowTestArray(const char* testName) {
|
| - if (!testName) {
|
| - testName = "xOp";
|
| - }
|
| - for (int x = gTestFirst; x < gTestNo; ++x) {
|
| - SkDebugf(" TEST(%s%d%s),\n", testName, x, opSuffixes[gTestOp[x - gTestFirst]]);
|
| - }
|
| -}
|
| -
|
| SK_DECLARE_STATIC_MUTEX(compareDebugOut3);
|
|
|
| static int comparePaths(skiatest::Reporter* reporter, const char* testName, const SkPath& one,
|
|
|