summaryrefslogtreecommitdiffstats
path: root/chrome/browser/gpu_pixel_browsertest.cc
diff options
context:
space:
mode:
authorjrt@chromium.org <jrt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-09 02:33:32 +0000
committerjrt@chromium.org <jrt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-09 02:33:32 +0000
commit51a84914077b3ebcf0a957f14d166fedf57919d3 (patch)
treea5918cee15e466f4690cda2a76594790d94f1368 /chrome/browser/gpu_pixel_browsertest.cc
parente02a03d09b2da3c8cfd92f691e5a4c0f01b77c03 (diff)
downloadchromium_src-51a84914077b3ebcf0a957f14d166fedf57919d3.zip
chromium_src-51a84914077b3ebcf0a957f14d166fedf57919d3.tar.gz
chromium_src-51a84914077b3ebcf0a957f14d166fedf57919d3.tar.bz2
Switch GpuPixelBrowserTest from FAILS to DISABLED.
Test still fails due to a NOTIMPLEMENTED() call from r93120. Marked as DISABLED until bug is fixed so the GPU bots are green (otherwise, it times out). BUG=89964 TEST=gpu_tests --gtest_filter=GpuPixelBrowserTest.WebGLTeapot Review URL: http://codereview.chromium.org/7528012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95937 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gpu_pixel_browsertest.cc')
-rw-r--r--chrome/browser/gpu_pixel_browsertest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/gpu_pixel_browsertest.cc b/chrome/browser/gpu_pixel_browsertest.cc
index d3ceff6..6bd1a5f 100644
--- a/chrome/browser/gpu_pixel_browsertest.cc
+++ b/chrome/browser/gpu_pixel_browsertest.cc
@@ -274,10 +274,10 @@ class GpuPixelBrowserTest : public InProcessBrowserTest {
DISALLOW_COPY_AND_ASSIGN(GpuPixelBrowserTest);
};
-// Currently fails on linux due to a NOTIMPLEMENTED() statement.
+// Currently fails (and times out) on linux due to a NOTIMPLEMENTED() statement.
// (http://crbug.com/89964)
#if defined(OS_LINUX)
-#define MAYBE_WebGLTeapot FAILS_WebGLTeapot
+#define MAYBE_WebGLTeapot DISABLED_WebGLTeapot
#else
#define MAYBE_WebGLTeapot WebGLTeapot
#endif