diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-06 21:43:37 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-06 21:43:37 +0000 |
| commit | 0992404e3815b7b0d00c64fc4f6beceac4bba10f (patch) | |
| tree | f3567cc9b72814d0715ad45214f66b79e897c790 /tests | |
| parent | 1b546462bb91e93cf2f033eb2dab53ec492b64ab (diff) | |
Split CPU and GPU DeferredCanvas tests
Nothing important, just happened to notice this and figured it was good hygiene.
DEF_TESTs run in parallel, while DEF_GPUTESTs run all run serially.
BUG=skia:
R=junov@chromium.org, mtklein@google.com
Author: mtklein@chromium.org
Review URL: https://codereview.chromium.org/271483002
git-svn-id: http://skia.googlecode.com/svn/trunk@14603 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/DeferredCanvasTest.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/tests/DeferredCanvasTest.cpp b/tests/DeferredCanvasTest.cpp index ffcbc23d56..ec65415b9e 100644 --- a/tests/DeferredCanvasTest.cpp +++ b/tests/DeferredCanvasTest.cpp @@ -816,7 +816,7 @@ static void TestDeferredCanvasCreateCompatibleDevice(skiatest::Reporter* reporte REPORTER_ASSERT(reporter, notificationCounter.fStorageAllocatedChangedCount == 1); } -DEF_GPUTEST(DeferredCanvas, reporter, factory) { +DEF_TEST(DeferredCanvas_CPU, reporter) { TestDeferredCanvasBitmapAccess(reporter); TestDeferredCanvasFlush(reporter); TestDeferredCanvasSilentFlush(reporter); @@ -830,8 +830,10 @@ DEF_GPUTEST(DeferredCanvas, reporter, factory) { TestDeferredCanvasWritePixelsToSurface(reporter); TestDeferredCanvasSurface(reporter, NULL); TestDeferredCanvasSetSurface(reporter, NULL); - if (NULL != factory) { - TestDeferredCanvasSurface(reporter, factory); - TestDeferredCanvasSetSurface(reporter, factory); - } +} + +DEF_GPUTEST(DeferredCanvas_GPU, reporter, factory) { + SkASSERT(factory != NULL); + TestDeferredCanvasSurface(reporter, factory); + TestDeferredCanvasSetSurface(reporter, factory); } |