From 1049f1246e7be4ccb68001361efceb8933e6f81c Mon Sep 17 00:00:00 2001 From: caryclark Date: Mon, 20 Apr 2015 08:31:59 -0700 Subject: Now, path ops natively intersect conics, quads, and cubics in any combination. There are still a class of cubic tests that fail and a handful of undiagnosed failures from skps and fuzz tests, but things are much better overall. Extended tests (150M+) run to completion in release in about 6 minutes; the standard test suite exceeds 100K and finishes in a few seconds on desktops. TBR=reed BUG=skia:3588 Review URL: https://codereview.chromium.org/1037953004 --- tests/PathOpsOpLoopThreadedTest.cpp | 28 +++------------------------- 1 file changed, 3 insertions(+), 25 deletions(-) (limited to 'tests/PathOpsOpLoopThreadedTest.cpp') diff --git a/tests/PathOpsOpLoopThreadedTest.cpp b/tests/PathOpsOpLoopThreadedTest.cpp index 3e43b9f75d..6a54b47ee4 100755 --- a/tests/PathOpsOpLoopThreadedTest.cpp +++ b/tests/PathOpsOpLoopThreadedTest.cpp @@ -53,7 +53,7 @@ static void testOpLoopsMain(PathOpsThreadState* data) { SkPath pathA, pathB; if (progress) { char* str = pathStr; - const int loopNo = 7; + const int loopNo = 12; str += sprintf(str, "static void loop%d(skiatest::Reporter* reporter," " const char* filename) {\n", loopNo); str += sprintf(str, " SkPath path, pathB;\n"); @@ -93,7 +93,7 @@ static void testOpLoopsMain(PathOpsThreadState* data) { } DEF_TEST(PathOpsOpLoopsThreaded, reporter) { - initializeTests(reporter, "cubicOp"); + initializeTests(reporter, "loopOp"); PathOpsThreadedTestRunner testRunner(reporter); for (int a = 0; a < 6; ++a) { // outermost for (int b = a + 1; b < 7; ++b) { @@ -108,27 +108,5 @@ DEF_TEST(PathOpsOpLoopsThreaded, reporter) { } finish: testRunner.render(); - ShowTestArray(); -} - -DEF_TEST(PathOpsOpLoops, reporter) { - initializeTests(reporter, "cubicOp"); - PathOpsThreadState state; - state.fReporter = reporter; - SkBitmap bitmap; - state.fBitmap = &bitmap; - char pathStr[PATH_STR_SIZE]; - state.fPathStr = pathStr; - for (state.fA = 0; state.fA < 6; ++state.fA) { // outermost - for (state.fB = state.fA + 1; state.fB < 7; ++state.fB) { - for (state.fC = 0 ; state.fC < 6; ++state.fC) { - for (state.fD = state.fC + 1; state.fD < 7; ++state.fD) { - testOpLoopsMain(&state); - } - } - if (!reporter->allowExtendedTest()) goto finish; - } - } -finish: - ShowTestArray(); + ShowTestArray("loopOp"); } -- cgit v1.2.3