Index: tests/PathOpsExtendedTest.cpp |
diff --git a/tests/PathOpsExtendedTest.cpp b/tests/PathOpsExtendedTest.cpp |
index f303ad1f16b9b509415547bd6f97d11fa22f9a28..c316242f75a5fb8b6172c0b5d2fad1edbf33573b 100644 |
--- a/tests/PathOpsExtendedTest.cpp |
+++ b/tests/PathOpsExtendedTest.cpp |
@@ -289,7 +289,7 @@ int comparePaths(skiatest::Reporter* reporter, const char* filename, const SkPat |
return errors2x2 > MAX_ERRORS ? errors2x2 : 0; |
} |
-const int gTestFirst = 4; |
+const int gTestFirst = 6; |
static int gTestNo = gTestFirst; |
static SkTDArray<SkPathOp> gTestOp; |
@@ -654,13 +654,34 @@ void RunTestSet(skiatest::Reporter* reporter, TestDesc tests[], size_t count, |
#endif |
(*tests[index].fun)(reporter, tests[index].str); |
} |
- if (tests[index].fun == stopTest) { |
- SkDebugf("lastTest\n"); |
+ if (tests[index].fun == stopTest || index == last) { |
break; |
} |
- if (index == last) { |
+ index += reverse ? -1 : 1; |
+ } while (true); |
+#if DEBUG_SHOW_TEST_NAME |
+ SkDebugf( |
+ "\n" |
+ "</div>\n" |
+ "\n" |
+ "<script type=\"text/javascript\">\n" |
+ "\n" |
+ "var testDivs = [\n" |
+ ); |
+ index = reverse ? count - 1 : 0; |
+ last = reverse ? 0 : count - 1; |
+ foundSkip = !skipTest; |
+ do { |
+ if (tests[index].fun == skipTest) { |
+ foundSkip = true; |
+ } |
+ 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 |
} |