Commit 384cd315 authored by jochen@chromium.org's avatar jochen@chromium.org

Disable GpuFeatureTest.WebGLBlocked and WebGLAllowed on ChromeOS

BUG=168972
TBR=vangelis@chromium.org

Review URL: https://codereview.chromium.org/11814003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175726 0039d316-1c4b-4281-b951-d872f2087c98
parent c9e97f21
......@@ -256,7 +256,13 @@ IN_PROC_BROWSER_TEST_F(AcceleratedCompositingTest,
RunEventTest(url, kSwapBuffersEvent, false);
}
IN_PROC_BROWSER_TEST_F(GpuFeatureTest, WebGLAllowed) {
// Flaky on ChromeOS, http://crbug.com/168972
#if defined(OS_CHROMEOS)
#define MAYBE_WebGLAllowed DISABLED_WebGLAllowed
#else
#define MAYBE_WebGLAllowed WebGLAllowed
#endif
IN_PROC_BROWSER_TEST_F(GpuFeatureTest, MAYBE_WebGLAllowed) {
GpuFeatureType type =
GpuDataManager::GetInstance()->GetBlacklistedFeatures();
EXPECT_EQ(type, 0);
......@@ -265,7 +271,13 @@ IN_PROC_BROWSER_TEST_F(GpuFeatureTest, WebGLAllowed) {
RunEventTest(url, kWebGLCreationEvent, true);
}
IN_PROC_BROWSER_TEST_F(GpuFeatureTest, WebGLBlocked) {
// Flaky on ChromeOS, http://crbug.com/168972
#if defined(OS_CHROMEOS)
#define MAYBE_WebGLBlocked DISABLED_WebGLBlocked
#else
#define MAYBE_WebGLBlocked WebGLBlocked
#endif
IN_PROC_BROWSER_TEST_F(GpuFeatureTest, MAYBE_WebGLBlocked) {
const std::string json_blacklist =
"{\n"
" \"name\": \"gpu blacklist\",\n"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment