OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2013 Google Inc. | 2 * Copyright 2013 Google Inc. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
6 */ | 6 */ |
7 | 7 |
8 #include "CrashHandler.h" | 8 #include "CrashHandler.h" |
9 #include "DMJsonWriter.h" | 9 #include "DMJsonWriter.h" |
10 #include "DMSrcSink.h" | 10 #include "DMSrcSink.h" |
(...skipping 1207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1218 // With the parallel work running, run serial tasks and tests here on main t
hread. | 1218 // With the parallel work running, run serial tasks and tests here on main t
hread. |
1219 for (auto task : serial) { Task::Run(task); } | 1219 for (auto task : serial) { Task::Run(task); } |
1220 for (auto test : gSerialTests) { run_test(test); } | 1220 for (auto test : gSerialTests) { run_test(test); } |
1221 | 1221 |
1222 // Wait for any remaining parallel work to complete (including any spun off
of serial tasks). | 1222 // Wait for any remaining parallel work to complete (including any spun off
of serial tasks). |
1223 parallel.wait(); | 1223 parallel.wait(); |
1224 gDefinitelyThreadSafeWork.wait(); | 1224 gDefinitelyThreadSafeWork.wait(); |
1225 | 1225 |
1226 // We'd better have run everything. | 1226 // We'd better have run everything. |
1227 SkASSERT(gPending == 0); | 1227 SkASSERT(gPending == 0); |
| 1228 // Make sure we've flushed all our results to disk. |
| 1229 JsonWriter::DumpJson(); |
1228 | 1230 |
1229 // At this point we're back in single-threaded land. | 1231 // At this point we're back in single-threaded land. |
1230 sk_tool_utils::release_portable_typefaces(); | 1232 sk_tool_utils::release_portable_typefaces(); |
1231 | 1233 |
1232 if (gFailures.count() > 0) { | 1234 if (gFailures.count() > 0) { |
1233 SkDebugf("Failures:\n"); | 1235 SkDebugf("Failures:\n"); |
1234 for (int i = 0; i < gFailures.count(); i++) { | 1236 for (int i = 0; i < gFailures.count(); i++) { |
1235 SkDebugf("\t%s\n", gFailures[i].c_str()); | 1237 SkDebugf("\t%s\n", gFailures[i].c_str()); |
1236 } | 1238 } |
1237 SkDebugf("%d failures\n", gFailures.count()); | 1239 SkDebugf("%d failures\n", gFailures.count()); |
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1335 Reporter* reporter, | 1337 Reporter* reporter, |
1336 GrContextFactory* fac
tory); | 1338 GrContextFactory* fac
tory); |
1337 } // namespace skiatest | 1339 } // namespace skiatest |
1338 | 1340 |
1339 #if !defined(SK_BUILD_FOR_IOS) | 1341 #if !defined(SK_BUILD_FOR_IOS) |
1340 int main(int argc, char** argv) { | 1342 int main(int argc, char** argv) { |
1341 SkCommandLineFlags::Parse(argc, argv); | 1343 SkCommandLineFlags::Parse(argc, argv); |
1342 return dm_main(); | 1344 return dm_main(); |
1343 } | 1345 } |
1344 #endif | 1346 #endif |
OLD | NEW |