diff options
| author | zmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-27 22:34:17 +0000 |
|---|---|---|
| committer | zmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-27 22:34:17 +0000 |
| commit | e6f5a668f2ddc58f4107a419668ad36dcf517372 (patch) | |
| tree | 19369a9bc70d79018b173d6c9edc4cc7972a5a77 | |
| parent | 3a173a2e71a9de91556ba717f3b392bcb9f0fc3b (diff) | |
| download | chromium_src-e6f5a668f2ddc58f4107a419668ad36dcf517372.zip chromium_src-e6f5a668f2ddc58f4107a419668ad36dcf517372.tar.gz chromium_src-e6f5a668f2ddc58f4107a419668ad36dcf517372.tar.bz2 | |
Disable PointCoordTest.RenderTo on Linux Release
BUG=162976
TEST=Linux ATI
TBR=gman
Review URL: https://codereview.chromium.org/11418192
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169776 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | gpu/command_buffer/tests/gl_depth_texture_unittest.cc | 4 | ||||
| -rw-r--r-- | gpu/command_buffer/tests/gl_pointcoord_unittest.cc | 9 |
2 files changed, 10 insertions, 3 deletions
diff --git a/gpu/command_buffer/tests/gl_depth_texture_unittest.cc b/gpu/command_buffer/tests/gl_depth_texture_unittest.cc index aa11034..324a2eb 100644 --- a/gpu/command_buffer/tests/gl_depth_texture_unittest.cc +++ b/gpu/command_buffer/tests/gl_depth_texture_unittest.cc @@ -62,8 +62,8 @@ struct FormatType { } // anonymous namespace -// crbug.com/135228 -// Fails on Win Intel, Linux Intel; flaky on Linux ATI +// crbug.com/135229 +// Fails on Win Intel, Linux Intel. #if ((defined(OS_WIN) || defined(OS_LINUX)) && defined(NDEBUG)) #define MAYBE_RenderTo FAILS_RenderTo #else diff --git a/gpu/command_buffer/tests/gl_pointcoord_unittest.cc b/gpu/command_buffer/tests/gl_pointcoord_unittest.cc index 1c799e6..5d6f192 100644 --- a/gpu/command_buffer/tests/gl_pointcoord_unittest.cc +++ b/gpu/command_buffer/tests/gl_pointcoord_unittest.cc @@ -65,7 +65,14 @@ GLfloat s2p(GLfloat s) { } // anonymous namespace -TEST_F(PointCoordTest, RenderTo) { +// crbug.com/162976 +// Flaky on Linux ATI bot. +#if (defined(OS_LINUX) && defined(NDEBUG)) +#define MAYBE_RenderTo FAILS_RenderTo +#else +#define MAYBE_RenderTo RenderTo +#endif +TEST_F(PointCoordTest, MAYBE_RenderTo) { static const char* v_shader_str = SHADER( attribute vec4 a_position; uniform float u_pointsize; |