summaryrefslogtreecommitdiffstats
path: root/content/test
diff options
context:
space:
mode:
authorzmo <zmo@chromium.org>2015-05-15 11:27:30 -0700
committerCommit bot <commit-bot@chromium.org>2015-05-15 18:27:35 +0000
commit4fbdae9877d2b4775efa0dffdaa9c16ed6689c75 (patch)
tree7a3371796d511811c042ddb31d4d40232b427143 /content/test
parente7d888132fc2fd641622d86b2b4c92fa4d01b124 (diff)
downloadchromium_src-4fbdae9877d2b4775efa0dffdaa9c16ed6689c75.zip
chromium_src-4fbdae9877d2b4775efa0dffdaa9c16ed6689c75.tar.gz
chromium_src-4fbdae9877d2b4775efa0dffdaa9c16ed6689c75.tar.bz2
Temporarily disable a webgl conformance test on D3D9 only.
BUG=488552 TEST=webgl conformacne with D3D9 backend R=kbr@chromium.org NOTRY=true Review URL: https://codereview.chromium.org/1135333004 Cr-Commit-Position: refs/heads/master@{#330138}
Diffstat (limited to 'content/test')
-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 52c7790..2e782df 100644
--- a/content/test/gpu/gpu_tests/webgl_conformance_expectations.py
+++ b/content/test/gpu/gpu_tests/webgl_conformance_expectations.py
@@ -80,6 +80,8 @@ class WebGLConformanceExpectations(GpuTestExpectations):
['win', 'd3d9'], bug=896) # angle bug ID
self.Skip('conformance/extensions/oes-texture-half-float-with-canvas.html',
['win', 'd3d9'], bug=896) # angle bug ID
+ self.Fail('conformance/glsl/bugs/conditional-discard-optimization.html',
+ ['win', 'd3d9'], bug=488552)
# Mac failures
self.Fail('conformance/glsl/misc/shaders-with-invariance.html',