OLD | NEW |
1 #ifndef DMTestTask_DEFINED | 1 #ifndef DMTestTask_DEFINED |
2 #define DMTestTask_DEFINED | 2 #define DMTestTask_DEFINED |
3 | 3 |
4 #include "DMReporter.h" | 4 #include "DMReporter.h" |
5 #include "DMTask.h" | 5 #include "DMTask.h" |
6 #include "DMTaskRunner.h" | 6 #include "DMTaskRunner.h" |
7 #include "SkString.h" | 7 #include "SkString.h" |
8 #include "SkTemplates.h" | 8 #include "SkTemplates.h" |
9 #include "Test.h" | 9 #include "Test.h" |
10 | 10 |
11 // Runs a unit test. | 11 // Runs a unit test. |
12 namespace DM { | 12 namespace DM { |
13 | 13 |
14 class TestReporter : public skiatest::Reporter { | 14 class TestReporter : public skiatest::Reporter { |
15 public: | 15 public: |
16 TestReporter() {} | 16 TestReporter() {} |
17 | 17 |
18 const char* failure() const { return fFailure.c_str(); } | 18 const char* failure() const { return fFailure.c_str(); } |
19 | 19 |
20 private: | 20 private: |
21 virtual bool allowExtendedTest() const SK_OVERRIDE; | 21 virtual bool allowExtendedTest() const SK_OVERRIDE; |
| 22 virtual bool allowThreaded() const SK_OVERRIDE; |
22 virtual bool verbose() const SK_OVERRIDE; | 23 virtual bool verbose() const SK_OVERRIDE; |
23 | 24 |
24 virtual void onReportFailed(const SkString& desc) SK_OVERRIDE { | 25 virtual void onReportFailed(const SkString& desc) SK_OVERRIDE { |
25 fFailure = desc; | 26 fFailure = desc; |
26 } | 27 } |
27 | 28 |
28 SkString fFailure; | 29 SkString fFailure; |
29 }; | 30 }; |
30 | 31 |
31 class CpuTestTask : public CpuTask { | 32 class CpuTestTask : public CpuTask { |
(...skipping 20 matching lines...) Expand all Loading... |
52 | 53 |
53 private: | 54 private: |
54 TestReporter fTestReporter; | 55 TestReporter fTestReporter; |
55 SkAutoTDelete<skiatest::Test> fTest; | 56 SkAutoTDelete<skiatest::Test> fTest; |
56 const SkString fName; | 57 const SkString fName; |
57 }; | 58 }; |
58 | 59 |
59 } // namespace DM | 60 } // namespace DM |
60 | 61 |
61 #endif // DMTestTask_DEFINED | 62 #endif // DMTestTask_DEFINED |
OLD | NEW |