Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(135)

Unified Diff: chrome/test/gpu/gpu_uitest.cc

Issue 4716002: Made OSMesa work on Mac for WebGL.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/gpu/gpu_thread.cc ('k') | chrome/test/test_launcher_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/gpu/gpu_uitest.cc
===================================================================
--- chrome/test/gpu/gpu_uitest.cc (revision 65262)
+++ chrome/test/gpu/gpu_uitest.cc (working copy)
@@ -21,14 +21,7 @@
FilePath gpu_test_dir_;
};
-// TODO(apatrick): OSMesa is flaky on Mac. http://crbug/61037
-#if defined(OS_MACOSX)
-#define MAYBE_UITestLaunchedWithOSMesa DISABLED_UITestLaunchedWithOSMesa
-#else
-#define MAYBE_UITestLaunchedWithOSMesa UITestLaunchedWithOSMesa
-#endif
-
-TEST_F(GPUUITest, MAYBE_UITestLaunchedWithOSMesa) {
+TEST_F(GPUUITest, UITestLaunchedWithOSMesa) {
// Check the webgl test reports success and that the renderer was OSMesa.
// We use OSMesa for tests in order to get consistent results across a
// variety of boxes.
« no previous file with comments | « chrome/gpu/gpu_thread.cc ('k') | chrome/test/test_launcher_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698