diff options
| author | zmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-27 23:00:35 +0000 |
|---|---|---|
| committer | zmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-27 23:00:35 +0000 |
| commit | f059ed0237af7e59afe40eec778937919417fa1e (patch) | |
| tree | 0be4458670d4a6298ed8405f28df8ffc30c8ce91 /gpu | |
| parent | c96e821a781f5caa9d760109d50252bc56fb1e1e (diff) | |
| download | chromium_src-f059ed0237af7e59afe40eec778937919417fa1e.zip chromium_src-f059ed0237af7e59afe40eec778937919417fa1e.tar.gz chromium_src-f059ed0237af7e59afe40eec778937919417fa1e.tar.bz2 | |
Use DISABLED_ instead of FAILS for two failing tests.
BUG=
TEST=gpu.fyi waterfall
TBR=gman
Review URL: https://codereview.chromium.org/11308238
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169780 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/command_buffer/tests/gl_depth_texture_unittest.cc | 4 | ||||
| -rw-r--r-- | gpu/command_buffer/tests/gl_pointcoord_unittest.cc | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/gpu/command_buffer/tests/gl_depth_texture_unittest.cc b/gpu/command_buffer/tests/gl_depth_texture_unittest.cc index 324a2eb..895cfd5 100644 --- a/gpu/command_buffer/tests/gl_depth_texture_unittest.cc +++ b/gpu/command_buffer/tests/gl_depth_texture_unittest.cc @@ -32,8 +32,6 @@ class DepthTextureTest : public testing::Test { GLManager gl_; }; - - GLuint DepthTextureTest::SetupUnitQuad(GLint position_location) { GLuint vbo = 0; glGenBuffers(1, &vbo); @@ -65,7 +63,7 @@ struct FormatType { // crbug.com/135229 // Fails on Win Intel, Linux Intel. #if ((defined(OS_WIN) || defined(OS_LINUX)) && defined(NDEBUG)) -#define MAYBE_RenderTo FAILS_RenderTo +#define MAYBE_RenderTo DISABLED_RenderTo #else #define MAYBE_RenderTo RenderTo #endif diff --git a/gpu/command_buffer/tests/gl_pointcoord_unittest.cc b/gpu/command_buffer/tests/gl_pointcoord_unittest.cc index 5d6f192..cf41927 100644 --- a/gpu/command_buffer/tests/gl_pointcoord_unittest.cc +++ b/gpu/command_buffer/tests/gl_pointcoord_unittest.cc @@ -68,10 +68,11 @@ GLfloat s2p(GLfloat s) { // crbug.com/162976 // Flaky on Linux ATI bot. #if (defined(OS_LINUX) && defined(NDEBUG)) -#define MAYBE_RenderTo FAILS_RenderTo +#define MAYBE_RenderTo DISABLED_RenderTo #else #define MAYBE_RenderTo RenderTo #endif + TEST_F(PointCoordTest, MAYBE_RenderTo) { static const char* v_shader_str = SHADER( attribute vec4 a_position; |