Commit efc86263 authored by zmo's avatar zmo Committed by Commit bot

Revert of Roll WebGL conformance tests. (patchset #4 id:250001 of...

Revert of Roll WebGL conformance tests. (patchset #4 id:250001 of https://codereview.chromium.org/641173002/)

Reason for revert:
might cause a bunch of texture related tests to timeout

conformance_textures_texture_formats_test
conformance_textures_texture_hd_dpi
conformance_textures_texture_mips
conformance_textures_texture_npot
conformance_textures_texture_npot_video
conformance_textures_texture_size
conformance_textures_texture_size_cube_maps
conformance_textures_texture_size_limit
conformance_textures_texture_sub_image_cube_maps
conformance_textures_texture_transparent_pixels_initialized
conformance_textures_texture_upload_cube_maps

Original issue's description:
> Roll WebGL conformance tests.
>
> BUG=401311,421705
> TEST=gpu bots
> NOTRY=true
> R=kbr@chromium.org
>
> Committed: https://crrev.com/84d03b89afa3baade276d0f7ac7892ab77ed8d21
> Cr-Commit-Position: refs/heads/master@{#299134}

TBR=kbr@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=401311,421705

Review URL: https://codereview.chromium.org/648833003

Cr-Commit-Position: refs/heads/master@{#299166}
parent 63a1fab0
...@@ -208,7 +208,7 @@ deps = { ...@@ -208,7 +208,7 @@ deps = {
Var('chromium_git') + '/external/bidichecker/lib.git' + '@' + '97f2aa645b74c28c57eca56992235c79850fa9e0', Var('chromium_git') + '/external/bidichecker/lib.git' + '@' + '97f2aa645b74c28c57eca56992235c79850fa9e0',
'src/third_party/webgl/src': 'src/third_party/webgl/src':
Var('chromium_git') + '/external/khronosgroup/webgl.git' + '@' + '34ac01c7aae98e74fbe14a6eb73297babb17c443', Var('chromium_git') + '/external/khronosgroup/webgl.git' + '@' + 'b1a7210dc4034793e34a2149cb571e85700a85f2',
'src/third_party/swig/Lib': 'src/third_party/swig/Lib':
Var('chromium_git') + '/chromium/deps/swig/Lib.git' + '@' + 'f2a695d52e61e6a8d967731434f165ed400f0d69', Var('chromium_git') + '/chromium/deps/swig/Lib.git' + '@' + 'f2a695d52e61e6a8d967731434f165ed400f0d69',
......
...@@ -25,16 +25,8 @@ class WebGLConformanceExpectations(test_expectations.TestExpectations): ...@@ -25,16 +25,8 @@ class WebGLConformanceExpectations(test_expectations.TestExpectations):
# ['mac', 'amd', ('nvidia', 0x1234)], bug=123) # ['mac', 'amd', ('nvidia', 0x1234)], bug=123)
# Fails on all platforms # Fails on all platforms
self.Fail('conformance/glsl/misc/shaders-with-invariance.html', self.Fail('conformance/glsl/misc/shaders-with-uniform-structs.html',
bug=421710) bug=351396)
self.Fail('conformance/glsl/misc/struct-unary-operators.html',
bug=421709)
self.Fail('conformance/renderbuffers/feedback-loop.html',
bug=421695)
self.Fail('conformance/textures/texture-copying-feedback-loops.html',
bug=421695)
self.Fail('conformance/textures/tex-image-and-sub-image-2d-with-webgl-canvas.html',
bug=420357)
# Flaky on Win # Flaky on Win
self.Fail('conformance/extensions/webgl-draw-buffers.html', self.Fail('conformance/extensions/webgl-draw-buffers.html',
...@@ -47,19 +39,6 @@ class WebGLConformanceExpectations(test_expectations.TestExpectations): ...@@ -47,19 +39,6 @@ class WebGLConformanceExpectations(test_expectations.TestExpectations):
['win'], bug=402195) ['win'], bug=402195)
self.Fail('conformance/attribs/gl-bindAttribLocation-matrix.html', self.Fail('conformance/attribs/gl-bindAttribLocation-matrix.html',
['win'], bug=415688) ['win'], bug=415688)
self.Fail('conformance/attribs/gl-bindAttribLocation-aliasing.html',
['win'], bug=415688)
self.Fail('conformance/textures/tex-image-and-sub-image-2d-with-webgl-canvas-rgb565.html',
['win'], bug=420357)
self.Fail('conformance/textures/tex-image-and-sub-image-2d-with-webgl-canvas-rgba4444.html',
['win'], bug=420357)
self.Fail('conformance/textures/tex-image-and-sub-image-2d-with-webgl-canvas-rgba5551.html',
['win'], bug=420357)
self.Fail('conformance/glsl/misc/ternary-operators-in-global-initializers.html',
['win'], bug=415694)
self.Fail('conformance/glsl/misc/ternary-operators-in-initializers.html',
['win'], bug=415694)
# Win7 / Intel failures # Win7 / Intel failures
self.Fail('conformance/rendering/gl-scissor-test.html', self.Fail('conformance/rendering/gl-scissor-test.html',
...@@ -151,10 +130,6 @@ class WebGLConformanceExpectations(test_expectations.TestExpectations): ...@@ -151,10 +130,6 @@ class WebGLConformanceExpectations(test_expectations.TestExpectations):
self.Fail('conformance/extensions/webgl-compressed-texture-size-limit.html', self.Fail('conformance/extensions/webgl-compressed-texture-size-limit.html',
['lion', 'intel'], bug=393331) ['lion', 'intel'], bug=393331)
# Linux failures
self.Fail('conformance/textures/default-texture.html',
['linux', ('nvidia', 0x104a)], bug=422152)
# Android failures # Android failures
# The following test is very slow and therefore times out on Android bot. # The following test is very slow and therefore times out on Android bot.
self.Skip('conformance/rendering/multisample-corruption.html', self.Skip('conformance/rendering/multisample-corruption.html',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment