deal more consistently with unsortable edges

tests/PathOpsExtendedTest.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "PathOpsExtendedTest.h"
 #include "PathOpsThreadedCommon.h"
 #include "SkBitmap.h"
@@ skipping 313 matching lines @@
 SK_DECLARE_STATIC_MUTEX(compareDebugOut3);
 SK_DECLARE_STATIC_MUTEX(compareDebugOut4);
 static int comparePaths(skiatest::Reporter* reporter, const char* testName, const SkPath& one,
         const SkPath& scaledOne, const SkPath& two, const SkPath& scaledTwo, SkBitmap& bitmap,
         const SkPath& a, const SkPath& b, const SkPathOp shapeOp, const SkMatrix& scale,
         bool expectSuccess, bool flaky) {
     int errors2x2;
     const int MAX_ERRORS = 8;
     (void) pathsDrawTheSame(bitmap, scaledOne, scaledTwo, errors2x2);
     if (!expectSuccess) {
-        if (errors2x2 <= MAX_ERRORS) {
+        if (errors2x2 <= MAX_ERRORS && !flaky) {
             REPORTER_ASSERT(reporter, 0);
         }
         return 0;
     }
     if (errors2x2 == 0) {
         return 0;
     }
     if (flaky) {
         return 0;
     }
@@ skipping 207 matching lines @@
     return innerPathOp(reporter, a, b, shapeOp, testName, false, true, true);
 }
 
 bool testPathOpCheck(skiatest::Reporter* reporter, const SkPath& a, const SkPath& b,
         const SkPathOp shapeOp, const char* testName, bool checkFail) {
     return innerPathOp(reporter, a, b, shapeOp, testName, false, checkFail, false);
 }
 
 bool testPathOpFailCheck(skiatest::Reporter* reporter, const SkPath& a, const SkPath& b,
         const SkPathOp shapeOp, const char* testName) {
-    return innerPathOp(reporter, a, b, shapeOp, testName, false, false, false);
+    return innerPathOp(reporter, a, b, shapeOp, testName, false, false, true);
 }
 
 bool testPathFailOp(skiatest::Reporter* reporter, const SkPath& a, const SkPath& b,
                  const SkPathOp shapeOp, const char* testName) {
 #if DEBUG_SHOW_TEST_NAME
     showName(a, b, shapeOp);
 #endif
     SkPath orig;
     orig.lineTo(54, 43);
     SkPath out = orig;
@@ skipping 114 matching lines @@
         if (foundSkip && tests[index].fun != firstTest) {
             SkDebugf("    %s,\n", tests[index].str);
         }
         if (tests[index].fun == stopTest || index == last) {
             break;
         }
         index += reverse ? -1 : 1;
     } while (true);
 #endif
 }