summaryrefslogtreecommitdiffstats
path: root/content/test
diff options
context:
space:
mode:
authorzmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-23 17:02:12 +0000
committerzmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-23 17:02:12 +0000
commit23d9cc9a16d997d7a3fc632edc6c9781e5abdc83 (patch)
tree6f1014502a08046f579188d9189d15297435e026 /content/test
parent3864ccfbab73b81686b39189a9eb4ee29790d119 (diff)
downloadchromium_src-23d9cc9a16d997d7a3fc632edc6c9781e5abdc83.zip
chromium_src-23d9cc9a16d997d7a3fc632edc6c9781e5abdc83.tar.gz
chromium_src-23d9cc9a16d997d7a3fc632edc6c9781e5abdc83.tar.bz2
Allow conformance/ogles/GL/control_flow/control_flow_009_to_010.html on mac 10.8 ATI/NVIDIA
It only fails on 10.7 or Intel GPUs BUG=322795 TEST= TBR=bajones@chromium.org,kbr@chromium.org Review URL: https://codereview.chromium.org/84473002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@236949 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/test')
-rw-r--r--content/test/gpu/gpu_tests/webgl_conformance_expectations.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/content/test/gpu/gpu_tests/webgl_conformance_expectations.py b/content/test/gpu/gpu_tests/webgl_conformance_expectations.py
index 4db3de0..4f2d4881 100644
--- a/content/test/gpu/gpu_tests/webgl_conformance_expectations.py
+++ b/content/test/gpu/gpu_tests/webgl_conformance_expectations.py
@@ -111,8 +111,6 @@ class WebGLConformanceExpectations(test_expectations.TestExpectations):
['mac'], bug=322770)
self.Skip('conformance/ogles/GL/control_flow/control_flow_001_to_008.html',
['mac'], bug=322795)
- self.Skip('conformance/ogles/GL/control_flow/control_flow_009_to_010.html',
- ['mac'], bug=322795)
# Mac/Intel failures
self.Fail('conformance/rendering/gl-scissor-test.html',
@@ -133,6 +131,8 @@ class WebGLConformanceExpectations(test_expectations.TestExpectations):
# Radar 13499623
self.Fail('conformance/textures/texture-size.html',
['mac', 'intel'], bug=225642)
+ self.Skip('conformance/ogles/GL/control_flow/control_flow_009_to_010.html',
+ ['mac', 'intel'], bug=322795)
# Mac/Intel failures on 10.7
self.Skip('conformance/glsl/functions/glsl-function-asin.html',
@@ -154,6 +154,8 @@ class WebGLConformanceExpectations(test_expectations.TestExpectations):
['lion', 'intel'])
self.Skip('conformance/rendering/line-loop-tri-fan.html',
['lion', 'intel'])
+ self.Skip('conformance/ogles/GL/control_flow/control_flow_009_to_010.html',
+ ['lion'], bug=322795)
# Mac/ATI failures
self.Skip('conformance/extensions/oes-texture-float-with-image-data.html',