From ccec0f958ffc71a9986d236bc2eb335cb2111119 Mon Sep 17 00:00:00 2001 From: caryclark Date: Tue, 24 Mar 2015 07:28:17 -0700 Subject: pathops version two R=reed@google.com marked 'no commit' to attempt to get trybots to run TBR=reed@google.com Review URL: https://codereview.chromium.org/1002693002 --- tests/PathOpsExtendedTest.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'tests/PathOpsExtendedTest.h') diff --git a/tests/PathOpsExtendedTest.h b/tests/PathOpsExtendedTest.h index 5f7e972f49..0428457b50 100644 --- a/tests/PathOpsExtendedTest.h +++ b/tests/PathOpsExtendedTest.h @@ -17,6 +17,7 @@ #include "Test.h" DECLARE_bool(runFail); +DECLARE_bool(runBinary); struct PathOpsThreadState; @@ -26,7 +27,8 @@ struct TestDesc { }; //extern int comparePaths(const SkPath& one, const SkPath& two); -extern int comparePaths(const SkPath& one, const SkPath& two, SkBitmap& bitmap); +extern int comparePaths(skiatest::Reporter* reporter, const char* filename, + const SkPath& one, const SkPath& two, SkBitmap& bitmap); extern bool drawAsciiPaths(const SkPath& one, const SkPath& two, bool drawPaths); extern void showOp(const SkPathOp op); extern bool testPathOp(skiatest::Reporter* reporter, const SkPath& a, const SkPath& b, @@ -40,6 +42,8 @@ extern bool testThreadedPathOp(skiatest::Reporter* reporter, const SkPath& a, co 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); +extern bool testSimplifyCheck(skiatest::Reporter* reporter, const SkPath& path, + const char* filename, bool checkFail); void initializeTests(skiatest::Reporter* reporter, const char* testName); void outputProgress(char* ramStr, const char* pathStr, SkPath::FillType ); @@ -47,6 +51,7 @@ void outputProgress(char* ramStr, const char* pathStr, SkPathOp op); void RunTestSet(skiatest::Reporter* reporter, TestDesc tests[], size_t count, void (*firstTest)(skiatest::Reporter* , const char* filename), + void (*skipTest)(skiatest::Reporter* , const char* filename), void (*stopTest)(skiatest::Reporter* , const char* filename), bool reverse); void ShowTestArray(); void ShowTestName(PathOpsThreadState* data, int a, int b, int c, int d); -- cgit v1.2.3