diff options
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/gpu/gpu_uitest.cc | 9 | ||||
| -rw-r--r-- | chrome/test/test_launcher_utils.cc | 7 |
2 files changed, 5 insertions, 11 deletions
diff --git a/chrome/test/gpu/gpu_uitest.cc b/chrome/test/gpu/gpu_uitest.cc index a6c43d0..c22f8f8 100644 --- a/chrome/test/gpu/gpu_uitest.cc +++ b/chrome/test/gpu/gpu_uitest.cc @@ -21,14 +21,7 @@ class GPUUITest : public UITest { 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. diff --git a/chrome/test/test_launcher_utils.cc b/chrome/test/test_launcher_utils.cc index 5b93422..aaf7bb9 100644 --- a/chrome/test/test_launcher_utils.cc +++ b/chrome/test/test_launcher_utils.cc @@ -33,12 +33,13 @@ void PrepareBrowserCommandLineForTests(CommandLine* command_line) { command_line->AppendSwitch(switches::kEnableLogging); command_line->AppendSwitchASCII(switches::kLoggingLevel, "1"); // warning - // TODO(apatrick): Other pending changes will fix this for mac. -#if !defined(OS_MACOSX) // Force all tests to use OSMesa if they launch the GPU process. command_line->AppendSwitchASCII(switches::kUseGL, gfx::kGLImplementationOSMesaName); -#endif + + // Mac does not support accelerated compositing with OSMesa. + // http://crbug.com/58343 + command_line->AppendSwitch(switches::kDisableAcceleratedCompositing); } bool OverrideUserDataDir(const FilePath& user_data_dir) { |