diff options
| author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-09 01:49:48 +0000 |
|---|---|---|
| committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-09 01:49:48 +0000 |
| commit | 04b7a5a3bcfe08aa22c33e341184dfbbd3c00646 (patch) | |
| tree | f93e0abba9e17b1c1b962455b0fb709c4fa0c794 /chrome | |
| parent | 816faf6fb462797cdda1f6d430598a59db8046e9 (diff) | |
| download | chromium_src-04b7a5a3bcfe08aa22c33e341184dfbbd3c00646.zip chromium_src-04b7a5a3bcfe08aa22c33e341184dfbbd3c00646.tar.gz chromium_src-04b7a5a3bcfe08aa22c33e341184dfbbd3c00646.tar.bz2 | |
Enabled GPUBrowserTest.BrowserTestLaunchedWithOSMesa on mac and windows.
TEST=try
BUG=61037
Review URL: http://codereview.chromium.org/4646003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65460 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/test/gpu/gpu_browsertest.cc | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/chrome/test/gpu/gpu_browsertest.cc b/chrome/test/gpu/gpu_browsertest.cc index 71f981a..ea8eb9b 100644 --- a/chrome/test/gpu/gpu_browsertest.cc +++ b/chrome/test/gpu/gpu_browsertest.cc @@ -28,15 +28,7 @@ class GPUBrowserTest : public InProcessBrowserTest { FilePath gpu_test_dir_; }; -// TODO(apatrick): OSMesa is flaky on Mac and Windows. http://crbug/61037 -#if defined(OS_WIN) || defined(OS_MACOSX) -#define MAYBE_BrowserTestLaunchedWithOSMesa \ - DISABLED_BrowserTestLaunchedWithOSMesa -#else -#define MAYBE_BrowserTestLaunchedWithOSMesa BrowserTestLaunchedWithOSMesa -#endif - -IN_PROC_BROWSER_TEST_F(GPUBrowserTest, MAYBE_BrowserTestLaunchedWithOSMesa) { +IN_PROC_BROWSER_TEST_F(GPUBrowserTest, BrowserTestLaunchedWithOSMesa) { // 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. |