Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-05 08:35:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge m-c to fx-team, a=merge

Browse Source
This commit is contained in:
Wes Kocher 2016-08-19 10:19:30 -07:00
commit 7745208efc
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dom/canvas/test/webgl-conf/generated-mochitest.ini
View File

@ -4662,7 +4662,7 @@ skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.
[generated/test_2_conformance__canvas__framebuffer-bindings-unaffected-on-resize.html]
skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2'))
[generated/test_2_conformance__canvas__rapid-resizing.html]
fail-if = (os == 'win')
fail-if = (os == 'win' && os_version != '6.1')
skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2'))
[generated/test_2_conformance__canvas__texture-bindings-unaffected-on-resize.html]
skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2'))
@ -6013,6 +6013,7 @@ fail-if = (os == 'android')
[generated/test_conformance__extensions__oes-texture-float-with-image.html]
fail-if = (os == 'android')
[generated/test_conformance__extensions__oes-texture-float-with-video.html]
skip-if = (os == 'win' && os_version == '6.1')
fail-if = (os == 'android')
[generated/test_conformance__extensions__oes-texture-float.html]
fail-if = (os == 'android')
@ -6025,6 +6026,7 @@ fail-if = (os == 'android')
[generated/test_conformance__extensions__oes-texture-half-float-with-image.html]
fail-if = (os == 'android')
[generated/test_conformance__extensions__oes-texture-half-float-with-video.html]
skip-if = (os == 'win' && os_version == '6.1')
fail-if = (os == 'android')
[generated/test_conformance__extensions__oes-texture-half-float.html]
fail-if = (os == 'mac') || (os == 'win') || (os == 'android') || (os == 'linux')

6
dom/canvas/test/webgl-conf/mochitest-errata.ini
View File

@ -239,6 +239,8 @@ fail-if = (os == 'android')
fail-if = (os == 'android')
[generated/test_conformance__extensions__oes-texture-float-with-video.html]
fail-if = (os == 'android')
# Frequent but intermittent timeout on win7
skip-if = (os == 'win' && os_version == '6.1')
[generated/test_conformance__extensions__oes-texture-half-float-linear.html]
fail-if = (os == 'android')
[generated/test_conformance__extensions__oes-texture-half-float-with-canvas.html]
@ -249,6 +251,8 @@ fail-if = (os == 'android')
fail-if = (os == 'android')
[generated/test_conformance__extensions__oes-texture-half-float-with-video.html]
fail-if = (os == 'android')
# Frequent but intermittent timeout on win7
skip-if = (os == 'win' && os_version == '6.1')
[generated/test_conformance__textures__video__tex-2d-rgb-rgb-unsigned_byte.html]
fail-if = (os == 'android')
[generated/test_conformance__textures__video__tex-2d-rgb-rgb-unsigned_short_5_6_5.html]
@ -665,6 +669,6 @@ skip-if = (os == 'win' && os_version == '6.1')
[generated/test_conformance__rendering__point-specific-shader-variables.html]
fail-if = (os == 'win' && os_version != '5.1')
[generated/test_2_conformance__canvas__rapid-resizing.html]
fail-if = (os == 'win')
fail-if = (os == 'win' && os_version != '6.1')
[generated/test_conformance__glsl__bugs__floor-div-cos-should-not-truncate.html]
fail-if = (os == 'win' && os_version == '5.1')