summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorzmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-11 21:45:16 +0000
committerzmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-11 21:46:33 +0000
commit55d2ebf4dc19adbf9151bed78224f63c2d645bb2 (patch)
tree1e364566d62dd8a189e8e342b15b76dba7c6f012 /content
parent43c5f57af975f8b17cec4242cb8408a8e359b31b (diff)
downloadchromium_src-55d2ebf4dc19adbf9151bed78224f63c2d645bb2.zip
chromium_src-55d2ebf4dc19adbf9151bed78224f63c2d645bb2.tar.gz
chromium_src-55d2ebf4dc19adbf9151bed78224f63c2d645bb2.tar.bz2
Roll khronos WebGL conformance tests to ToT.
BUG=393331,402195 TEST=gpu waterfall R=kbr@chromium.org NOTRY=true Review URL: https://codereview.chromium.org/455853003 Cr-Commit-Position: refs/heads/master@{#288799} git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288799 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/test/gpu/gpu_tests/webgl_conformance_expectations.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/content/test/gpu/gpu_tests/webgl_conformance_expectations.py b/content/test/gpu/gpu_tests/webgl_conformance_expectations.py
index 688400b6..239e1c3 100644
--- a/content/test/gpu/gpu_tests/webgl_conformance_expectations.py
+++ b/content/test/gpu/gpu_tests/webgl_conformance_expectations.py
@@ -35,6 +35,8 @@ class WebGLConformanceExpectations(test_expectations.TestExpectations):
# Win failures
self.Fail('conformance/glsl/misc/struct-equals.html',
['win'], bug=391957)
+ self.Fail('conformance/glsl/bugs/conditional-discard-in-loop.html',
+ ['win'], bug=402195)
self.Fail('conformance/rendering/negative-one-index.html',
['win'], bug=396058)