diff options
author | 2015-01-15 14:20:41 -0800 | |
---|---|---|
committer | 2015-01-15 14:20:42 -0800 | |
commit | 2f64eec5df75d96178c667ebba0be965eae16440 (patch) | |
tree | e14d4cb4d67f41796c8964b181767d772b0f2e8c /dm/DM.cpp | |
parent | e1315526cdec7ab08b0a2940f449dd7e1c9173ff (diff) |
Totally serialize gpu tests on Windows.
NOTREECHECKS=true
BUG=skia:3255
Review URL: https://codereview.chromium.org/845193006
Diffstat (limited to 'dm/DM.cpp')
-rw-r--r-- | dm/DM.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
@@ -443,16 +443,25 @@ int dm_main() { tg.batch( run_test, gCPUTests.begin(), gCPUTests.count()); if (FLAGS_gpu_threading) { tg.batch(run_test, gGPUTests.begin(), gGPUTests.count()); + #if !defined(SK_BUILD_FOR_WIN32) } else { for (int i = 0; i < gGPUTests.count(); i++) { run_test(&gGPUTests[i]); } + #endif } tg.wait(); - // At this point we're back in single-threaded land. - SkDebugf("\n"); + // This is not ideal for parallelism, but Windows seems crash-prone if we run + // these GPU tests in parallel with any GPU Src/Sink work. Everyone else seems fine. +#if defined(SK_BUILD_FOR_WIN32) + for (int i = 0; i < gGPUTests.count(); i++) { + run_test(&gGPUTests[i]); + } +#endif + + SkDebugf("\n"); JsonWriter::DumpJson(); if (gFailures.count() > 0) { |