From dbf25181bdc9b161d841725c387bc95cb3c9243f Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Wed, 7 May 2014 12:33:02 +0000 Subject: [PATCH] Revert of Split CPU and GPU DeferredCanvas tests (https://codereview.chromium.org/271483002/) Reason for revert: breaking the run tests steps on ChromeOS. See http://108.170.220.120:10117/builders/Test-ChromeOS-Alex-GMA3150-x86-Debug/builds/1669 Original issue's description: > 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: > > Committed: http://code.google.com/p/skia/source/detail?r=14603 R=junov@chromium.org, mtklein@google.com, mtklein@chromium.org TBR=junov@chromium.org, mtklein@chromium.org, mtklein@google.com NOTREECHECKS=true NOTRY=true BUG=skia: Author: djsollen@google.com Review URL: https://codereview.chromium.org/270283003 git-svn-id: http://skia.googlecode.com/svn/trunk@14607 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests/DeferredCanvasTest.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/tests/DeferredCanvasTest.cpp b/tests/DeferredCanvasTest.cpp index ec65415b9e..ffcbc23d56 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_TEST(DeferredCanvas_CPU, reporter) { +DEF_GPUTEST(DeferredCanvas, reporter, factory) { TestDeferredCanvasBitmapAccess(reporter); TestDeferredCanvasFlush(reporter); TestDeferredCanvasSilentFlush(reporter); @@ -830,10 +830,8 @@ DEF_TEST(DeferredCanvas_CPU, reporter) { TestDeferredCanvasWritePixelsToSurface(reporter); TestDeferredCanvasSurface(reporter, NULL); TestDeferredCanvasSetSurface(reporter, NULL); -} - -DEF_GPUTEST(DeferredCanvas_GPU, reporter, factory) { - SkASSERT(factory != NULL); - TestDeferredCanvasSurface(reporter, factory); - TestDeferredCanvasSetSurface(reporter, factory); + if (NULL != factory) { + TestDeferredCanvasSurface(reporter, factory); + TestDeferredCanvasSetSurface(reporter, factory); + } }