diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-19 05:52:06 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-19 05:52:06 +0000 |
| commit | 6903090e8ee9ab8c67977d139c4b51369ed70bc7 (patch) | |
| tree | d8207668fb4027ce6288b1e6c63f8be2613d043d /chrome/test/gpu | |
| parent | 860c735b773776a6257dbce60c33204a4bce8213 (diff) | |
| download | chromium_src-6903090e8ee9ab8c67977d139c4b51369ed70bc7.zip chromium_src-6903090e8ee9ab8c67977d139c4b51369ed70bc7.tar.gz chromium_src-6903090e8ee9ab8c67977d139c4b51369ed70bc7.tar.bz2 | |
Re-enable CanLaunchWithOSMesa tests for browser_tests and ui_tests on linux_views and linux_chromeos.
BUG=76217
TEST=GPUBrowserTest.BrowserTestCanLaunchWithOSMesa, GPUUITest.UITestCanLaunchWithOSMesa
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78814 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/gpu')
| -rw-r--r-- | chrome/test/gpu/gpu_browsertest.cc | 3 | ||||
| -rw-r--r-- | chrome/test/gpu/gpu_uitest.cc | 4 |
2 files changed, 1 insertions, 6 deletions
diff --git a/chrome/test/gpu/gpu_browsertest.cc b/chrome/test/gpu/gpu_browsertest.cc index d96915b..43c58ea 100644 --- a/chrome/test/gpu/gpu_browsertest.cc +++ b/chrome/test/gpu/gpu_browsertest.cc @@ -46,9 +46,8 @@ class GPUBrowserTest : public InProcessBrowserTest { FilePath gpu_test_dir_; }; -#if defined(TOOLKIT_VIEWS) +#if defined(OS_WIN) // Flaky on Windows (dbg): http://crbug.com/72608 -// For ChromeOS: http://crbug.com/76217 #define MAYBE_BrowserTestCanLaunchWithOSMesa DISABLED_BrowserTestCanLaunchWithOSMesa #else #define MAYBE_BrowserTestCanLaunchWithOSMesa BrowserTestCanLaunchWithOSMesa diff --git a/chrome/test/gpu/gpu_uitest.cc b/chrome/test/gpu/gpu_uitest.cc index a392982..e5792a3 100644 --- a/chrome/test/gpu/gpu_uitest.cc +++ b/chrome/test/gpu/gpu_uitest.cc @@ -35,10 +35,6 @@ class GPUUITest : public UITest { FilePath gpu_test_dir_; }; -#if !defined(OS_WIN) && defined(TOOLKIT_VIEWS) -#define UITestCanLaunchWithOSMesa DISABLED_UITestCanLaunchWithOSMesa -// http://crbug.com/76217 -#endif TEST_F(GPUUITest, UITestCanLaunchWithOSMesa) { // Check the webgl test reports success and that the renderer was OSMesa. NavigateToURL( |