summaryrefslogtreecommitdiffstats
path: root/chrome/test/gpu
diff options
context:
space:
mode:
authorapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-05 18:51:53 +0000
committerapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-05 18:51:53 +0000
commita861c9dcaef31d0dad9fbc78a6093f025d564169 (patch)
treeccf6b6606dbf707bda3427c640db61e4e625fb94 /chrome/test/gpu
parentd118f54157b7a2cd0b76ff4c59027ae67024e438 (diff)
downloadchromium_src-a861c9dcaef31d0dad9fbc78a6093f025d564169.zip
chromium_src-a861c9dcaef31d0dad9fbc78a6093f025d564169.tar.gz
chromium_src-a861c9dcaef31d0dad9fbc78a6093f025d564169.tar.bz2
Enabled GPUUITest.UITestLaunchedWithOSMesa on windows.
Passes on trybots. I believe r64858 or r65011 might have fixed it. I will commit and watch for flake on the buildbots. TEST=try BUG=61037 Review URL: http://codereview.chromium.org/4549001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65232 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/gpu')
-rw-r--r--chrome/test/gpu/gpu_uitest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/test/gpu/gpu_uitest.cc b/chrome/test/gpu/gpu_uitest.cc
index 9b6a78c..a6c43d0 100644
--- a/chrome/test/gpu/gpu_uitest.cc
+++ b/chrome/test/gpu/gpu_uitest.cc
@@ -21,8 +21,8 @@ class GPUUITest : public UITest {
FilePath gpu_test_dir_;
};
-// TODO(apatrick): OSMesa is flaky on Mac and Windows. http://crbug/61037
-#if defined(OS_WIN) || defined(OS_MACOSX)
+// TODO(apatrick): OSMesa is flaky on Mac. http://crbug/61037
+#if defined(OS_MACOSX)
#define MAYBE_UITestLaunchedWithOSMesa DISABLED_UITestLaunchedWithOSMesa
#else
#define MAYBE_UITestLaunchedWithOSMesa UITestLaunchedWithOSMesa