add simplify to json tests
pathops_unittest -J dump.json
now generates both Op() and Simplify() tests and results.
Also, make json names unique. While this may not be necessary,
duplicate names may make debugging failing tests more difficult.
R=kjlubick@google.com
Bug: skia:
Change-Id: I2eed5a8141764a0ad993fb9a09c23b7d90d65048
Reviewed-on: https://skia-review.googlesource.com/146100
Commit-Queue: Cary Clark <caryclark@skia.org>
Commit-Queue: Kevin Lubick <kjlubick@google.com>
Auto-Submit: Cary Clark <caryclark@skia.org>
Reviewed-by: Kevin Lubick <kjlubick@google.com>
diff --git a/tests/PathOpsOpTest.cpp b/tests/PathOpsOpTest.cpp
index 2f847e4..14a8068 100644
--- a/tests/PathOpsOpTest.cpp
+++ b/tests/PathOpsOpTest.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 "PathOpsDebug.h"
#include "PathOpsExtendedTest.h"
#include "PathOpsTestCommon.h"
@@ -1195,7 +1196,9 @@
SkPath path;
path.setFillType(SkPath::kInverseEvenOdd_FillType);
for (int index = 0; index < 5; ++index) {
- testPathOp(reporter, path, paths[index], ops[index], filename);
+ SkString uniqueName;
+ uniqueName.printf("%s%d", filename, index);
+ testPathOp(reporter, path, paths[index], ops[index], uniqueName.c_str());
REPORTER_ASSERT(reporter, Op(path, paths[index], ops[index], &path));
}
}
@@ -12470,6 +12473,9 @@
};
DEF_TEST(PathOpsRepOp, reporter) {
+ if (PathOpsDebug::gJson) {
+ return;
+ }
for (int index = 0; index < 1; ++index)
RunTestSet(reporter, repTests, SK_ARRAY_COUNT(repTests), nullptr, nullptr, nullptr, false);
}