diff options
| author | ccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-09 00:48:31 +0000 |
|---|---|---|
| committer | ccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-09 00:48:31 +0000 |
| commit | b0e96dcd6934af89cc70accc0160f246cb210785 (patch) | |
| tree | b478d46861ca90b4041a33eca97f43b33ebe0ac7 /chrome/test/gpu | |
| parent | 7ed41e75c974a6276e84b9392d09182a392375e0 (diff) | |
| download | chromium_src-b0e96dcd6934af89cc70accc0160f246cb210785.zip chromium_src-b0e96dcd6934af89cc70accc0160f246cb210785.tar.gz chromium_src-b0e96dcd6934af89cc70accc0160f246cb210785.tar.bz2 | |
Update GPU feature tests to expect no GPU on Windows <=Vista
BUG=243476
Review URL: https://codereview.chromium.org/128893002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243714 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/gpu')
| -rw-r--r-- | chrome/test/gpu/gpu_feature_browsertest.cc | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/chrome/test/gpu/gpu_feature_browsertest.cc b/chrome/test/gpu/gpu_feature_browsertest.cc index f5a0d49..59270b1 100644 --- a/chrome/test/gpu/gpu_feature_browsertest.cc +++ b/chrome/test/gpu/gpu_feature_browsertest.cc @@ -295,10 +295,6 @@ IN_PROC_BROWSER_TEST_F(WebGLTest, WebGLDisabled) { RunEventTest(url, kWebGLCreationEvent, false); } -#if (defined(GOOGLE_CHROME_BUILD) && defined(OS_MACOSX)) || defined(OS_WIN) -// http://crbug.com/314745 and http://crbug.com/332341 -#define MultisamplingAllowed DISABLED_MultisamplingAllowed -#endif IN_PROC_BROWSER_TEST_F(GpuFeatureTest, MultisamplingAllowed) { bool expect_blacklisted = false; if (gpu::GPUTestBotConfig::GpuBlacklistedOnBot()) @@ -367,13 +363,7 @@ IN_PROC_BROWSER_TEST_F(WebGLMultisamplingTest, MultisamplingDisabled) { RunTest(url, "\"FALSE\"", true); } -// http://crbug.com/332341 -#if defined(OS_WIN) -#define MAYBE_Canvas2DAllowed DISABLED_Canvas2DAllowed -#else -#define MAYBE_Canvas2DAllowed Canvas2DAllowed -#endif -IN_PROC_BROWSER_TEST_F(GpuFeatureTest, MAYBE_Canvas2DAllowed) { +IN_PROC_BROWSER_TEST_F(GpuFeatureTest, Canvas2DAllowed) { // Accelerated canvas 2D is not supported on XP. if (gpu::GPUTestBotConfig::CurrentConfigMatches("XP")) return; @@ -448,16 +438,8 @@ IN_PROC_BROWSER_TEST_F(Canvas2DDisabledTest, Canvas2DDisabled) { RunEventTest(url, kAcceleratedCanvasCreationEvent, false); } -// Fails on XP and Vista bots. http://crbug.com/332341 -#if defined(OS_WIN) -#define MAYBE_CanOpenPopupAndRenderWithWebGLCanvas \ - DISABLED_CanOpenPopupAndRenderWithWebGLCanvas -#else -#define MAYBE_CanOpenPopupAndRenderWithWebGLCanvas \ - CanOpenPopupAndRenderWithWebGLCanvas -#endif IN_PROC_BROWSER_TEST_F(GpuFeatureTest, - MAYBE_CanOpenPopupAndRenderWithWebGLCanvas) { + CanOpenPopupAndRenderWithWebGLCanvas) { if (gpu::GPUTestBotConfig::GpuBlacklistedOnBot()) return; |