diff options
| author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-27 20:34:36 +0000 |
|---|---|---|
| committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-27 20:34:36 +0000 |
| commit | a3ed6c82468f9f704a1b7e112ea3c132adb5ea2e (patch) | |
| tree | 90c192802071ccfaf2bdbe355850440fc2c6ef1a /chrome/test | |
| parent | ab718b1eba9827397338a9aeaf03fd0b7548d555 (diff) | |
| download | chromium_src-a3ed6c82468f9f704a1b7e112ea3c132adb5ea2e.zip chromium_src-a3ed6c82468f9f704a1b7e112ea3c132adb5ea2e.tar.gz chromium_src-a3ed6c82468f9f704a1b7e112ea3c132adb5ea2e.tar.bz2 | |
Temporarily disabling test GPUTest.UITestLaunchedWithOSMesa on linux.
Test was new in r64122 and failed.
http://build.chromium.org/p/chromium/builders/Linux%20Tests%20x64/builds/761/steps/ui_tests/logs/stdio
TEST=none
BUG=none
TBR=kbr@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64138 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -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 |