diff options
| author | gab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-10 19:59:57 +0000 |
|---|---|---|
| committer | gab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-10 19:59:57 +0000 |
| commit | ad15e527d974aa222677e2ebe80b320ba0fd4803 (patch) | |
| tree | d3cb6e9325b04a35bb7e19879f9755d9961b7cbb /chrome/test/gpu | |
| parent | 55398d2c62c998c1665451cd1046d41f1238b0b2 (diff) | |
| download | chromium_src-ad15e527d974aa222677e2ebe80b320ba0fd4803.zip chromium_src-ad15e527d974aa222677e2ebe80b320ba0fd4803.tar.gz chromium_src-ad15e527d974aa222677e2ebe80b320ba0fd4803.tar.bz2 | |
Enable GPU control lists in tests.
Reland of https://codereview.chromium.org/23534006/ (see that and the bug for more details).
Also adding INFO-level logging to spell out each control list rule being applied on the bots (makes debugging and understanding failures much easier).
R=piman@chromium.org
TBR=jcivelli, piman, zmo
BUG=295799, 304833
Previously Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=224810
Reverted: https://src.chromium.org/viewvc/chrome?view=rev&revision=224845
Review URL: https://codereview.chromium.org/23703017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227977 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/gpu')
| -rw-r--r-- | chrome/test/gpu/gpu_feature_browsertest.cc | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/chrome/test/gpu/gpu_feature_browsertest.cc b/chrome/test/gpu/gpu_feature_browsertest.cc index 5e14cc4..95b37d8 100644 --- a/chrome/test/gpu/gpu_feature_browsertest.cc +++ b/chrome/test/gpu/gpu_feature_browsertest.cc @@ -216,7 +216,7 @@ class AcceleratedCompositingBlockedTest : public GpuFeatureTest { #endif IN_PROC_BROWSER_TEST_F(AcceleratedCompositingBlockedTest, - MAYBE_AcceleratedCompositingBlocked) { + MAYBE_AcceleratedCompositingBlocked) { EXPECT_TRUE(GpuDataManager::GetInstance()->IsFeatureBlacklisted( gpu::GPU_FEATURE_TYPE_ACCELERATED_COMPOSITING)); @@ -361,11 +361,18 @@ IN_PROC_BROWSER_TEST_F(GpuFeatureTest, Canvas2DAllowed) { if (gpu::GPUTestBotConfig::CurrentConfigMatches("XP")) return; - EXPECT_FALSE(GpuDataManager::GetInstance()->IsFeatureBlacklisted( - gpu::GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS)); + bool is_blacklisted = false; +#if defined(OS_LINUX) && !defined(OS_CHROMEOS) + // Blacklist rule #24 disables accelerated_2d_canvas on Linux. + is_blacklisted = true; +#endif + + EXPECT_EQ(is_blacklisted, + GpuDataManager::GetInstance()->IsFeatureBlacklisted( + gpu::GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS)); const base::FilePath url(FILE_PATH_LITERAL("feature_canvas2d.html")); - RunEventTest(url, kAcceleratedCanvasCreationEvent, true); + RunEventTest(url, kAcceleratedCanvasCreationEvent, !is_blacklisted); } IN_PROC_BROWSER_TEST_F(GpuFeatureTest, Canvas2DBlocked) { |