summaryrefslogtreecommitdiffstats
path: root/content/test
diff options
context:
space:
mode:
authorzmo@google.com <zmo@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-22 01:14:16 +0000
committerzmo@google.com <zmo@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-22 01:14:16 +0000
commitdc767b2ab6f249b614c47a35a0f4fd7fb06ffd6d (patch)
tree6ab6b1dc4b7d0d64dff216983a21f8b3a5457f82 /content/test
parent009bb91568a95854779cb918589c6bc43735781a (diff)
downloadchromium_src-dc767b2ab6f249b614c47a35a0f4fd7fb06ffd6d.zip
chromium_src-dc767b2ab6f249b614c47a35a0f4fd7fb06ffd6d.tar.gz
chromium_src-dc767b2ab6f249b614c47a35a0f4fd7fb06ffd6d.tar.bz2
Mark two texture-video related webgl tests as timeout
BUG=162344 TEST=Win Debug NVIDIA gpu bots TBR=kbr Review URL: https://codereview.chromium.org/11299150 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169185 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/test')
-rw-r--r--content/test/data/gpu/webgl_conformance_test_expectations.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/content/test/data/gpu/webgl_conformance_test_expectations.txt b/content/test/data/gpu/webgl_conformance_test_expectations.txt
index b16fe08..e5e96ab 100644
--- a/content/test/data/gpu/webgl_conformance_test_expectations.txt
+++ b/content/test/data/gpu/webgl_conformance_test_expectations.txt
@@ -123,6 +123,9 @@ UNFILED WIN7 INTEL : conformance_textures_tex_image_and_sub_image_2d_with_image_
UNFILED WIN7 INTEL : conformance_textures_tex_image_and_sub_image_2d_with_image_data_rgba4444 = FAIL
UNFILED WIN7 INTEL : conformance_textures_tex_image_and_sub_image_2d_with_image_data_rgba5551 = FAIL
+162344 WIN7 DEBUG NVIDIA : conformance_textures_tex_image_and_sub_image_2d_with_video_rgba4444 = TIMEOUT
+162344 WIN7 DEBUG NVIDIA : conformance_textures_tex_image_and_sub_image_2d_with_video_rgba5551 = TIMEOUT
+
UNFILED MAC INTEL : conformance_glsl_functions_glsl_function_asin = FAIL
UNFILED MAC INTEL : conformance_glsl_functions_glsl_function_dot = FAIL
UNFILED MAC INTEL : conformance_glsl_functions_glsl_function_faceforward = FAIL