summaryrefslogtreecommitdiffstats
path: root/content/test
diff options
context:
space:
mode:
authorbajones@chromium.org <bajones@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-21 17:04:44 +0000
committerbajones@chromium.org <bajones@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-21 17:04:44 +0000
commitc3628b4d18377676370cd048d7fc8b88bf85fd52 (patch)
tree993f200eb1b5bdbe1a44bd763446c509a48dea06 /content/test
parent3c23587a8b7a4057a51ee2365f6a3d359c6d841b (diff)
downloadchromium_src-c3628b4d18377676370cd048d7fc8b88bf85fd52.zip
chromium_src-c3628b4d18377676370cd048d7fc8b88bf85fd52.tar.gz
chromium_src-c3628b4d18377676370cd048d7fc8b88bf85fd52.tar.bz2
Flagged flaky test on Lion in WebGL test expectations
On 10.7 ReadPixels sometimes takes an extrodinarily long time to complete, which causes the test to timeout. Since the antialiasing code causing this to fail is blacklisted on 10.7 anyway we're going to skip this test. BUG=196706 Review URL: https://chromiumcodereview.appspot.com/12787016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@189636 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/test')
-rw-r--r--content/test/data/gpu/webgl_conformance_test_expectations.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/content/test/data/gpu/webgl_conformance_test_expectations.txt b/content/test/data/gpu/webgl_conformance_test_expectations.txt
index ad9d3e2..09b52d0 100644
--- a/content/test/data/gpu/webgl_conformance_test_expectations.txt
+++ b/content/test/data/gpu/webgl_conformance_test_expectations.txt
@@ -7,7 +7,7 @@
// {BUG#} {MODIFIERS} : {TEST_NAME} = {PASS,FAIL,FLAKY,TIMEOUT,SKIP}
//
// MODIFIERS can be a combination of the below list:
-// WIN XP VISTA WIN7 MAC LEOPARD SNOWLEOPARD LION LINUX CHROMEOS
+// WIN XP VISTA WIN7 MAC LEOPARD SNOWLEOPARD LION LINUX CHROMEOS MOUNTAINLION
// NVIDIA AMD INTEL
// 0x**** (this is a gpu's PCI device ID)
// DEBUG RELEASE
@@ -142,7 +142,8 @@ UNFILED MAC AMD : conformance_attribs_gl_vertexattribpointer_offsets = FAIL
UNFILED MAC AMD : conformance_attribs_gl_vertexattribpointer = FAIL
UNFILED MAC AMD : conformance_misc_type_conversion_test = FAIL
UNFILED MAC AMD : conformance_renderbuffers_framebuffer_object_attachment = FAIL
-UNFILED MAC AMD : conformance_textures_copy_tex_image_and_sub_image_2d = FAIL
+196706 MOUNTAINLION AMD : conformance_textures_copy_tex_image_and_sub_image_2d = FAIL
+196706 LION : conformance_textures_copy_tex_image_and_sub_image_2d = FAIL
UNFILED MAC AMD : conformance_typedarrays_array_unit_tests = FAIL
UNFILED MAC AMD : conformance_glsl_functions_glsl_function_distance = FAIL
UNFILED MAC AMD : conformance_glsl_functions_glsl_function_dot = FAIL