cumulative pathops patch

tests/PathOpsSimplifyFailTest.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "SkPath.h"
 #include "SkPathOps.h"
 #include "SkPoint.h"
 #include "Test.h"
@@ skipping 68 matching lines @@
         case 5: path.cubicTo(finitePts[f], finitePts[f], finitePts[g]); break;
         case 6: path.cubicTo(finitePts[f], finitePts[g], finitePts[f]); break;
         case 7: path.cubicTo(finitePts[f], finitePts[g], finitePts[g]); break;
         case 8: path.cubicTo(finitePts[g], finitePts[f], finitePts[f]); break;
         case 9: path.cubicTo(finitePts[g], finitePts[f], finitePts[g]); break;
         case 10: path.moveTo(finitePts[f]); break;
     }
     SkPath result;
     result.setFillType(SkPath::kWinding_FillType);
     bool success = Simplify(path, &result);
-    // linux 32 debug fails test 13 because the quad is not treated as linear
-    // there's no error in the math that I can find -- it looks like a processor
-    // or compiler bug -- so for now, allow either to work
-    REPORTER_ASSERT(reporter, success || index == 13);
+    REPORTER_ASSERT(reporter, success);
     REPORTER_ASSERT(reporter, result.getFillType() != SkPath::kWinding_FillType);
     reporter->bumpTestCount();
 }
 
 DEF_TEST(PathOpsSimplifyFail, reporter) {
     for (int index = 0; index < (int) (13 * nonFinitePtsCount * finitePtsCount); ++index) {
         failOne(reporter, index);
     }
     for (int index = 0; index < (int) (11 * finitePtsCount); ++index) {
         dontFailOne(reporter, index);
     }
 }
 
 DEF_TEST(PathOpsSimplifyFailOne, reporter) {
     int index = 0;
     failOne(reporter, index);
 }
 
 DEF_TEST(PathOpsSimplifyDontFailOne, reporter) {
     int index = 13;
     dontFailOne(reporter, index);
 }