cumulative pathops patch

tests/PathOpsExtendedTest.h

Index: tests/PathOpsExtendedTest.h
diff --git a/tests/PathOpsExtendedTest.h b/tests/PathOpsExtendedTest.h
index 5f7e972f49799bd3117ac23b1619d81a52aa1b74..0428457b50aec6e211ec524acaa4d63a4ef4e159 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);