diff options
| author | zmo@google.com <zmo@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-10 22:10:36 +0000 |
|---|---|---|
| committer | zmo@google.com <zmo@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-10 22:10:36 +0000 |
| commit | 06aa51c76763cc1116e67eaec11bbb3cb4eba617 (patch) | |
| tree | c15fb98392727f5fbca688c8da33e77f2ab4d79e | |
| parent | 48f85e445b0182015140038745c3896b13404b9e (diff) | |
| download | chromium_src-06aa51c76763cc1116e67eaec11bbb3cb4eba617.zip chromium_src-06aa51c76763cc1116e67eaec11bbb3cb4eba617.tar.gz chromium_src-06aa51c76763cc1116e67eaec11bbb3cb4eba617.tar.bz2 | |
Disable two tests that TIMEOUT on GPU bots
GPUCrashTest.Kill on Debug
GpuPixelBrowserTest.WebGLTeapot
BUG=95214,101513
TEST=no failures of these two tests show in gpu bots
TBR=apatrick
Review URL: http://codereview.chromium.org/8469012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109519 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/gpu_crash_browsertest.cc | 9 | ||||
| -rw-r--r-- | chrome/browser/gpu_pixel_browsertest.cc | 12 |
2 files changed, 9 insertions, 12 deletions
diff --git a/chrome/browser/gpu_crash_browsertest.cc b/chrome/browser/gpu_crash_browsertest.cc index a8cf8d9..671a791 100644 --- a/chrome/browser/gpu_crash_browsertest.cc +++ b/chrome/browser/gpu_crash_browsertest.cc @@ -47,8 +47,13 @@ class GPUCrashTest : public InProcessBrowserTest { FilePath gpu_test_dir_; }; - -IN_PROC_BROWSER_TEST_F(GPUCrashTest, Kill) { +// Currently Kill timeout on GPU Debug bots: http://crbug.com/101513 +#if !defined(NDEBUG) +#define MAYBE_Kill DISABLED_Kill +#else +#define MAYBE_Kill Kill +#endif +IN_PROC_BROWSER_TEST_F(GPUCrashTest, MAYBE_Kill) { ui_test_utils::DOMMessageQueue message_queue; ui_test_utils::NavigateToURL( diff --git a/chrome/browser/gpu_pixel_browsertest.cc b/chrome/browser/gpu_pixel_browsertest.cc index e7c9eba..26581fa 100644 --- a/chrome/browser/gpu_pixel_browsertest.cc +++ b/chrome/browser/gpu_pixel_browsertest.cc @@ -255,19 +255,11 @@ class GpuPixelBrowserTest : public InProcessBrowserTest { DISALLOW_COPY_AND_ASSIGN(GpuPixelBrowserTest); }; -#if defined(OS_LINUX) // Currently fails (and times out) on linux due to a NOTIMPLEMENTED() statement. // (http://crbug.com/89964) -#define MAYBE_WebGLTeapot DISABLED_WebGLTeapot -#elif defined(OS_WIN) -// Fails (and times out) on Windows due to pixel mismatch. +// Fails (and times out) on Windows/Mac due to pixel mismatch. // (http://crbug.com/95214) -#define MAYBE_WebGLTeapot DISABLED_WebGLTeapot -#else -#define MAYBE_WebGLTeapot WebGLTeapot -#endif - -IN_PROC_BROWSER_TEST_F(GpuPixelBrowserTest, MAYBE_WebGLTeapot) { +IN_PROC_BROWSER_TEST_F(GpuPixelBrowserTest, DISABLED_WebGLTeapot) { ui_test_utils::DOMMessageQueue message_queue; ui_test_utils::NavigateToURL( browser(), |