summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-14 16:17:32 +0000
committerjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-14 16:17:32 +0000
commit02f574ac804b054aad7243491a6434a70557d7f9 (patch)
treeb79be6edc416ab07662321b1bb8ab2a66a5b8356
parent1aa3adabb01549d5032f673e3527f2bc1747f4fd (diff)
downloadchromium_src-02f574ac804b054aad7243491a6434a70557d7f9.zip
chromium_src-02f574ac804b054aad7243491a6434a70557d7f9.tar.gz
chromium_src-02f574ac804b054aad7243491a6434a70557d7f9.tar.bz2
Mark GpuFeatureTest.WebGLAllowed flaky.
It has been timing out about 5-10% of the time on Linux bots. TBR=zmo@chromium.org BUG=104142 Review URL: http://codereview.chromium.org/8510059 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109893 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/test/gpu/gpu_feature_browsertest.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/test/gpu/gpu_feature_browsertest.cc b/chrome/test/gpu/gpu_feature_browsertest.cc
index 005b85c..f7e65a5 100644
--- a/chrome/test/gpu/gpu_feature_browsertest.cc
+++ b/chrome/test/gpu/gpu_feature_browsertest.cc
@@ -100,6 +100,10 @@ IN_PROC_BROWSER_TEST_F(GpuFeatureTest, AcceleratedCompositingBlocked) {
RunTest(url, expect_gpu_process);
}
+#if defined(OS_LINUX)
+// http://crbug.com/104142
+#define WebGLAllowed FLAKY_WebGLAllowed
+#endif
IN_PROC_BROWSER_TEST_F(GpuFeatureTest, WebGLAllowed) {
GpuFeatureFlags flags = GpuDataManager::GetInstance()->GetGpuFeatureFlags();
EXPECT_EQ(flags.flags(), 0u);