OLD | NEW |
1 // Main binary for DM. | 1 // Main binary for DM. |
2 // For a high-level overview, please see dm/README. | 2 // For a high-level overview, please see dm/README. |
3 | 3 |
4 #include "CrashHandler.h" | 4 #include "CrashHandler.h" |
5 #include "SkCommonFlags.h" | 5 #include "SkCommonFlags.h" |
6 #include "SkForceLinking.h" | 6 #include "SkForceLinking.h" |
7 #include "SkGraphics.h" | 7 #include "SkGraphics.h" |
8 #include "SkPicture.h" | 8 #include "SkPicture.h" |
9 #include "SkString.h" | 9 #include "SkString.h" |
10 #include "Test.h" | 10 #include "Test.h" |
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
227 append_matching_factories<Test>(TestRegistry::Head(), &tests); | 227 append_matching_factories<Test>(TestRegistry::Head(), &tests); |
228 } | 228 } |
229 | 229 |
230 SkTArray<SkString> skps; | 230 SkTArray<SkString> skps; |
231 find_skps(&skps); | 231 find_skps(&skps); |
232 | 232 |
233 SkDebugf("%d GMs x %d configs, %d tests, %d pictures\n", | 233 SkDebugf("%d GMs x %d configs, %d tests, %d pictures\n", |
234 gms.count(), configs.count(), tests.count(), skps.count()); | 234 gms.count(), configs.count(), tests.count(), skps.count()); |
235 DM::Reporter reporter; | 235 DM::Reporter reporter; |
236 DM::TaskRunner tasks(FLAGS_threads, FLAGS_gpuThreads); | 236 DM::TaskRunner tasks(FLAGS_threads, FLAGS_gpuThreads); |
| 237 kick_off_tests(tests, &reporter, &tasks); |
237 kick_off_gms(gms, configs, gpuAPI, *expectations, &reporter, &tasks); | 238 kick_off_gms(gms, configs, gpuAPI, *expectations, &reporter, &tasks); |
238 kick_off_tests(tests, &reporter, &tasks); | |
239 kick_off_skps(skps, &reporter, &tasks); | 239 kick_off_skps(skps, &reporter, &tasks); |
240 tasks.wait(); | 240 tasks.wait(); |
241 | 241 |
242 SkDebugf("\n"); | 242 SkDebugf("\n"); |
243 #ifdef SK_DEBUG | 243 #ifdef SK_DEBUG |
244 if (FLAGS_portableFonts && FLAGS_reportUsedChars) { | 244 if (FLAGS_portableFonts && FLAGS_reportUsedChars) { |
245 sk_tool_utils::report_used_chars(); | 245 sk_tool_utils::report_used_chars(); |
246 } | 246 } |
247 #endif | 247 #endif |
248 | 248 |
249 SkTArray<SkString> failures; | 249 SkTArray<SkString> failures; |
250 reporter.getFailures(&failures); | 250 reporter.getFailures(&failures); |
251 report_failures(failures); | 251 report_failures(failures); |
252 return failures.count() > 0; | 252 return failures.count() > 0; |
253 } | 253 } |
254 | 254 |
255 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL) | 255 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL) |
256 int main(int argc, char** argv) { | 256 int main(int argc, char** argv) { |
257 SkCommandLineFlags::Parse(argc, argv); | 257 SkCommandLineFlags::Parse(argc, argv); |
258 return dm_main(); | 258 return dm_main(); |
259 } | 259 } |
260 #endif | 260 #endif |
OLD | NEW |