From 8d0a524a4847bc7e1cc63a93b78922739466c201 Mon Sep 17 00:00:00 2001 From: "caryclark@google.com" Date: Tue, 16 Jul 2013 16:11:16 +0000 Subject: harden and speed up path op unit tests PathOps tests internal routines direcctly. Check to make sure that test points, lines, quads, curves, triangles, and bounds read from arrays are valid (i.e., don't contain NaN) before calling the test function. Repurpose the test flags. - make 'v' verbose test region output against path output - make 'z' single threaded (before it made it multithreaded) The latter change speeds up tests run by the buildbot by 2x to 3x. BUG= Review URL: https://codereview.chromium.org/19374003 git-svn-id: http://skia.googlecode.com/svn/trunk@10107 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests/PathOpsDRectTest.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'tests/PathOpsDRectTest.cpp') diff --git a/tests/PathOpsDRectTest.cpp b/tests/PathOpsDRectTest.cpp index 6eb1955d28..7cadf6340e 100644 --- a/tests/PathOpsDRectTest.cpp +++ b/tests/PathOpsDRectTest.cpp @@ -4,6 +4,7 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ +#include "PathOpsTestCommon.h" #include "SkPathOpsCubic.h" #include "SkPathOpsLine.h" #include "SkPathOpsQuad.h" @@ -42,6 +43,7 @@ static void PathOpsDRectTest(skiatest::Reporter* reporter) { SkDRect rect, rect2; for (index = 0; index < lineTests_count; ++index) { const SkDLine& line = lineTests[index]; + SkASSERT(ValidLine(line)); rect.setBounds(line); REPORTER_ASSERT(reporter, rect.fLeft == SkTMin(line[0].fX, line[1].fX)); REPORTER_ASSERT(reporter, rect.fTop == SkTMin(line[0].fY, line[1].fY)); @@ -58,6 +60,7 @@ static void PathOpsDRectTest(skiatest::Reporter* reporter) { } for (index = 0; index < quadTests_count; ++index) { const SkDQuad& quad = quadTests[index]; + SkASSERT(ValidQuad(quad)); rect.setRawBounds(quad); REPORTER_ASSERT(reporter, rect.fLeft == SkTMin(quad[0].fX, SkTMin(quad[1].fX, quad[2].fX))); @@ -77,6 +80,7 @@ static void PathOpsDRectTest(skiatest::Reporter* reporter) { } for (index = 0; index < cubicTests_count; ++index) { const SkDCubic& cubic = cubicTests[index]; + SkASSERT(ValidCubic(cubic)); rect.setRawBounds(cubic); REPORTER_ASSERT(reporter, rect.fLeft == SkTMin(cubic[0].fX, SkTMin(cubic[1].fX, SkTMin(cubic[2].fX, cubic[3].fX)))); -- cgit v1.2.3