OLD | NEW |
1 #include "DMTestTask.h" | 1 #include "DMTestTask.h" |
2 #include "DMUtil.h" | 2 #include "DMUtil.h" |
3 #include "SkCommandLineFlags.h" | 3 #include "SkCommandLineFlags.h" |
4 #include "SkCommonFlags.h" | 4 #include "SkCommonFlags.h" |
5 | 5 |
6 DEFINE_bool2(pathOpsExtended, x, false, "Run extended pathOps tests."); | 6 DEFINE_bool2(pathOpsExtended, x, false, "Run extended pathOps tests."); |
7 | 7 |
8 namespace DM { | 8 namespace DM { |
9 | 9 |
10 bool TestReporter::allowExtendedTest() const { return FLAGS_pathOpsExtended; } | 10 bool TestReporter::allowExtendedTest() const { return FLAGS_pathOpsExtended; } |
(...skipping 17 matching lines...) Expand all Loading... |
28 skiatest::TestRegistry::Factory factory) | 28 skiatest::TestRegistry::Factory factory) |
29 : GpuTask(reporter, taskRunner) | 29 : GpuTask(reporter, taskRunner) |
30 , fTest(factory(NULL)) | 30 , fTest(factory(NULL)) |
31 , fName(test_name(fTest->getName())) {} | 31 , fName(test_name(fTest->getName())) {} |
32 | 32 |
33 | 33 |
34 void CpuTestTask::draw() { | 34 void CpuTestTask::draw() { |
35 fTest->setReporter(&fTestReporter); | 35 fTest->setReporter(&fTestReporter); |
36 fTest->run(); | 36 fTest->run(); |
37 if (!fTest->passed()) { | 37 if (!fTest->passed()) { |
38 this->fail(fTestReporter.failure()); | 38 const SkTArray<SkString>& failures = fTestReporter.failures(); |
| 39 for (int i = 0; i < failures.count(); i++) { |
| 40 this->fail(failures[i].c_str()); |
| 41 } |
39 } | 42 } |
40 } | 43 } |
41 | 44 |
42 void GpuTestTask::draw(GrContextFactory* grFactory) { | 45 void GpuTestTask::draw(GrContextFactory* grFactory) { |
43 fTest->setGrContextFactory(grFactory); | 46 fTest->setGrContextFactory(grFactory); |
44 fTest->setReporter(&fTestReporter); | 47 fTest->setReporter(&fTestReporter); |
45 fTest->run(); | 48 fTest->run(); |
46 if (!fTest->passed()) { | 49 if (!fTest->passed()) { |
47 this->fail(fTestReporter.failure()); | 50 const SkTArray<SkString>& failures = fTestReporter.failures(); |
| 51 for (int i = 0; i < failures.count(); i++) { |
| 52 this->fail(failures[i].c_str()); |
| 53 } |
48 } | 54 } |
49 } | 55 } |
50 | 56 |
51 bool GpuTestTask::shouldSkip() const { | 57 bool GpuTestTask::shouldSkip() const { |
52 return kGPUDisabled; | 58 return kGPUDisabled; |
53 } | 59 } |
54 | 60 |
55 } // namespace DM | 61 } // namespace DM |
OLD | NEW |