summaryrefslogtreecommitdiffstats
path: root/chrome/test/gpu
diff options
context:
space:
mode:
authorjshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-10 19:25:23 +0000
committerjshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-10 19:25:23 +0000
commit6c77b6398efe36adb559541f3b964f2df798fc87 (patch)
tree13f571af98054c3f14a23ffc1bacea0c30d8f714 /chrome/test/gpu
parent6895618147396d6b17359cc8a5578124aa52bbc3 (diff)
downloadchromium_src-6c77b6398efe36adb559541f3b964f2df798fc87.zip
chromium_src-6c77b6398efe36adb559541f3b964f2df798fc87.tar.gz
chromium_src-6c77b6398efe36adb559541f3b964f2df798fc87.tar.bz2
Mark GPUBrowserTest.BrowserTestCanLaunchWithOSMesa on Windows.
On XP (dbg), flakyness rate is 8%. BUG=72608 TEST=NONE TBR=apatrick Review URL: http://codereview.chromium.org/6474004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74462 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/gpu')
-rw-r--r--chrome/test/gpu/gpu_browsertest.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/test/gpu/gpu_browsertest.cc b/chrome/test/gpu/gpu_browsertest.cc
index cc29938ee..d41c0c1 100644
--- a/chrome/test/gpu/gpu_browsertest.cc
+++ b/chrome/test/gpu/gpu_browsertest.cc
@@ -46,7 +46,14 @@ class GPUBrowserTest : public InProcessBrowserTest {
FilePath gpu_test_dir_;
};
-IN_PROC_BROWSER_TEST_F(GPUBrowserTest, BrowserTestCanLaunchWithOSMesa) {
+#if defined(OS_WIN)
+// Flaky on Windows (dbg): http://crbug.com/72608
+#define MAYBE_BrowserTestCanLaunchWithOSMesa FLAKY_BrowserTestCanLaunchWithOSMesa
+#else
+#define MAYBE_BrowserTestCanLaunchWithOSMesa BrowserTestCanLaunchWithOSMesa
+#endif
+
+IN_PROC_BROWSER_TEST_F(GPUBrowserTest, MAYBE_BrowserTestCanLaunchWithOSMesa) {
// Check the webgl test reports success and that the renderer was OSMesa.
ui_test_utils::NavigateToURL(
browser(),