diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-15 21:54:38 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-15 21:54:38 +0000 |
| commit | 32d4f65edef2759379606e9d65c9b4b010595983 (patch) | |
| tree | 9bfb74bad9279fe008c1b0b49c9a20374f018fbf | |
| parent | 5e0ffd107b078cd688fffaecd82401a9a474027b (diff) | |
| download | chromium_src-32d4f65edef2759379606e9d65c9b4b010595983.zip chromium_src-32d4f65edef2759379606e9d65c9b4b010595983.tar.gz chromium_src-32d4f65edef2759379606e9d65c9b4b010595983.tar.bz2 | |
Disable the test CanLaunchWithOSMesa (browser, ui) on toolkit_views.
BUG=76217
TEST=CanLaunchWithOSMesa in browser_tests, ui_tests
Review URL: http://codereview.chromium.org/6693033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78297 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/test/gpu/gpu_browsertest.cc | 2 | ||||
| -rw-r--r-- | chrome/test/gpu/gpu_uitest.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/test/gpu/gpu_browsertest.cc b/chrome/test/gpu/gpu_browsertest.cc index cb5386c..d96915b 100644 --- a/chrome/test/gpu/gpu_browsertest.cc +++ b/chrome/test/gpu/gpu_browsertest.cc @@ -46,7 +46,7 @@ class GPUBrowserTest : public InProcessBrowserTest { FilePath gpu_test_dir_; }; -#if defined(OS_WIN) || defined(OS_CHROMEOS) +#if defined(TOOLKIT_VIEWS) // Flaky on Windows (dbg): http://crbug.com/72608 // For ChromeOS: http://crbug.com/76217 #define MAYBE_BrowserTestCanLaunchWithOSMesa DISABLED_BrowserTestCanLaunchWithOSMesa diff --git a/chrome/test/gpu/gpu_uitest.cc b/chrome/test/gpu/gpu_uitest.cc index 6780bb4..a392982 100644 --- a/chrome/test/gpu/gpu_uitest.cc +++ b/chrome/test/gpu/gpu_uitest.cc @@ -35,7 +35,7 @@ class GPUUITest : public UITest { FilePath gpu_test_dir_; }; -#if defined(OS_CHROMEOS) +#if !defined(OS_WIN) && defined(TOOLKIT_VIEWS) #define UITestCanLaunchWithOSMesa DISABLED_UITestCanLaunchWithOSMesa // http://crbug.com/76217 #endif |