diff --git a/dom/canvas/test/webgl-conf/generated-mochitest.ini b/dom/canvas/test/webgl-conf/generated-mochitest.ini index 2c8dc91df456..b0e64d8db9af 100644 --- a/dom/canvas/test/webgl-conf/generated-mochitest.ini +++ b/dom/canvas/test/webgl-conf/generated-mochitest.ini @@ -6206,7 +6206,6 @@ skip-if = (os == 'android' || os == 'linux') [generated/test_2_conformance__extensions__webgl-compressed-texture-atc.html] skip-if = (os == 'android' || os == 'linux') [generated/test_2_conformance__extensions__webgl-compressed-texture-etc.html] -fail-if = (os == 'mac') || (os == 'win') skip-if = (os == 'android' || os == 'linux') [generated/test_2_conformance__extensions__webgl-compressed-texture-pvrtc.html] skip-if = (os == 'android' || os == 'linux') @@ -6215,7 +6214,7 @@ skip-if = (os == 'android' || os == 'linux') [generated/test_2_conformance__extensions__webgl-compressed-texture-s3tc.html] skip-if = (os == 'android' || os == 'linux') [generated/test_2_conformance__extensions__webgl-compressed-texture-size-limit.html] -skip-if = (os == 'win') || (os == 'android' || os == 'linux') +skip-if = (os == 'android' || os == 'linux') [generated/test_2_conformance__extensions__webgl-debug-renderer-info.html] skip-if = (os == 'android' || os == 'linux') [generated/test_2_conformance__extensions__webgl-debug-shaders.html] @@ -7608,7 +7607,6 @@ fail-if = (os == 'mac') || (os == 'linux') || (os == 'win') [generated/test_conformance__extensions__webgl-compressed-texture-s3tc-srgb.html] [generated/test_conformance__extensions__webgl-compressed-texture-s3tc.html] [generated/test_conformance__extensions__webgl-compressed-texture-size-limit.html] -skip-if = (os == 'win') [generated/test_conformance__extensions__webgl-debug-renderer-info.html] [generated/test_conformance__extensions__webgl-debug-shaders.html] [generated/test_conformance__extensions__webgl-depth-texture.html] diff --git a/dom/canvas/test/webgl-conf/mochitest-errata.ini b/dom/canvas/test/webgl-conf/mochitest-errata.ini index 287d8aaf7bc0..527e4fec8b14 100644 --- a/dom/canvas/test/webgl-conf/mochitest-errata.ini +++ b/dom/canvas/test/webgl-conf/mochitest-errata.ini @@ -327,8 +327,6 @@ fail-if = (os == 'mac') || (os == 'win') fail-if = (os == 'mac') || (os == 'win') [generated/test_2_conformance2__textures__video__tex-3d-srgb8_alpha8-rgba-unsigned_byte.html] fail-if = (os == 'mac') || (os == 'win') -[generated/test_2_conformance__extensions__webgl-compressed-texture-etc.html] -fail-if = (os == 'mac') || (os == 'win') [generated/test_2_conformance__textures__video__tex-2d-rgb-rgb-unsigned_byte.html] fail-if = (os == 'mac') || (os == 'win') [generated/test_2_conformance__textures__video__tex-2d-rgb-rgb-unsigned_short_5_6_5.html] @@ -865,9 +863,6 @@ skip-if = (os == 'win' && debug) [generated/test_conformance__textures__misc__tex-image-and-sub-image-2d-with-array-buffer-view.html] # time out crash skip-if = (os == 'win' && debug) -[generated/test_conformance__extensions__webgl-compressed-texture-size-limit.html] -# skip this because the result is not always pass -skip-if = (os == 'win') [generated/test_2_conformance2__glsl3__loops-with-side-effects.html] # application crashed [@ nvoglv32.dll + 0x999512] skip-if = (os == 'win') @@ -938,9 +933,6 @@ skip-if = (os == 'win' && os_version == '6.1') [generated/test_2_conformance__textures__misc__tex-image-and-sub-image-2d-with-array-buffer-view.html] # Failure on win7 but got passed on win7 vm skip-if = (os == 'win' && os_version == '6.1') -[generated/test_2_conformance__extensions__webgl-compressed-texture-size-limit.html] -# Test timed out. -skip-if = (os == 'win') [generated/test_2_conformance2__textures__misc__tex-input-validation.html] skip-if = (os == 'win') [generated/test_2_conformance2__buffers__get-buffer-sub-data.html]