summaryrefslogtreecommitdiffstats
path: root/chrome/browser/gpu_pixel_browsertest.cc
diff options
context:
space:
mode:
authornduca@chromium.org <nduca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-02 16:07:32 +0000
committernduca@chromium.org <nduca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-02 16:07:32 +0000
commitd6ea4b86d9d89746b6dbcba1cbf7f029737a4b87 (patch)
treecce066f15e8af8f135c6e73efa570e1327befa32 /chrome/browser/gpu_pixel_browsertest.cc
parent841c84197cb9a0bd794a4eb56a02ae1f6d9c5014 (diff)
downloadchromium_src-d6ea4b86d9d89746b6dbcba1cbf7f029737a4b87.zip
chromium_src-d6ea4b86d9d89746b6dbcba1cbf7f029737a4b87.tar.gz
chromium_src-d6ea4b86d9d89746b6dbcba1cbf7f029737a4b87.tar.bz2
Disable WebGLTeapot on windows. crbug.com/95214
Review URL: http://codereview.chromium.org/7826031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99378 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gpu_pixel_browsertest.cc')
-rw-r--r--chrome/browser/gpu_pixel_browsertest.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/browser/gpu_pixel_browsertest.cc b/chrome/browser/gpu_pixel_browsertest.cc
index 6bd1a5f..f4a7baa 100644
--- a/chrome/browser/gpu_pixel_browsertest.cc
+++ b/chrome/browser/gpu_pixel_browsertest.cc
@@ -274,9 +274,13 @@ 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)
-#if defined(OS_LINUX)
+#define MAYBE_WebGLTeapot DISABLED_WebGLTeapot
+#elif defined(OS_WIN)
+// Fails (and times out) on Windows due to pixel mismatch.
+// (http://crbug.com/95214)
#define MAYBE_WebGLTeapot DISABLED_WebGLTeapot
#else
#define MAYBE_WebGLTeapot WebGLTeapot