diff options
| -rw-r--r-- | chrome/test/test_launcher_utils.cc | 2 | ||||
| -rw-r--r-- | chrome/test/ui/gpu_uitest.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/test/test_launcher_utils.cc b/chrome/test/test_launcher_utils.cc index 5b93422..26b80a3 100644 --- a/chrome/test/test_launcher_utils.cc +++ b/chrome/test/test_launcher_utils.cc @@ -34,7 +34,7 @@ void PrepareBrowserCommandLineForTests(CommandLine* command_line) { command_line->AppendSwitchASCII(switches::kLoggingLevel, "1"); // warning // TODO(apatrick): Other pending changes will fix this for mac. -#if !defined(OS_MACOSX) +#if !defined(OS_MACOSX) && !defined(OS_LINUX) // Force all tests to use OSMesa if they launch the GPU process. command_line->AppendSwitchASCII(switches::kUseGL, gfx::kGLImplementationOSMesaName); diff --git a/chrome/test/ui/gpu_uitest.cc b/chrome/test/ui/gpu_uitest.cc index 75a6f5a..15a7bf1 100644 --- a/chrome/test/ui/gpu_uitest.cc +++ b/chrome/test/ui/gpu_uitest.cc @@ -22,7 +22,7 @@ class GPUTest : public UITest { }; // TODO(apatrick): Other pending changes will fix this for mac. -#if defined(OS_MACOSX) +#if defined(OS_MACOSX) || defined(OS_LINUX) #define MAYBE_UITestLaunchedWithOSMesa FAILS_UITestLaunchedWithOSMesa #else #define MAYBE_UITestLaunchedWithOSMesa UITestLaunchedWithOSMesa |