Bug 1359055 - Part 2: Enable compressed texture unpack buffer tests; r?jgilbert draft
authorDaosheng Mu <daoshengmu@gmail.com>
Thu, 31 Aug 2017 03:02:28 +0800
changeset 656147 cb4411bf96d3b525f2ae99704b3c0500c0d9929d
parent 653571 c90e231f5ddf02a84c1e849f13ee56bda93548e8
child 656148 37a6e23751c6807931758d0cb4d12d222f3ac656
child 656149 a9699338afd0f33f51d8ca7c191b24e0231d3fd1
child 656774 46c7a6fa061c2446aba5bffa61825f2a26c21cf0
child 660446 708285f82b370708cf84046313d0b5ca65af25e7
push id77087
push userbmo:dmu@mozilla.com
push dateWed, 30 Aug 2017 19:38:00 +0000
reviewersjgilbert
bugs1359055
milestone57.0a1
Bug 1359055 - Part 2: Enable compressed texture unpack buffer tests; r?jgilbert MozReview-Commit-ID: Dvdf8ORrGtg
dom/canvas/test/webgl-conf/generated-mochitest.ini
dom/canvas/test/webgl-conf/mochitest-errata.ini
--- a/dom/canvas/test/webgl-conf/generated-mochitest.ini
+++ b/dom/canvas/test/webgl-conf/generated-mochitest.ini
@@ -6201,26 +6201,25 @@ skip-if = (os == 'android' || os == 'lin
 skip-if = (os == 'android' || os == 'linux')
 [generated/test_2_conformance__extensions__get-extension.html]
 skip-if = (os == 'android' || os == 'linux')
 [generated/test_2_conformance__extensions__oes-texture-float-linear.html]
 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')
 [generated/test_2_conformance__extensions__webgl-compressed-texture-s3tc-srgb.html]
 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]
 skip-if = (os == 'android' || os == 'linux')
 [generated/test_2_conformance__extensions__webgl-shared-resources.html]
 skip-if = (os == 'android' || os == 'linux')
 [generated/test_2_conformance__glsl__bugs__angle-ambiguous-function-call.html]
 skip-if = (os == 'android' || os == 'linux')
@@ -7603,17 +7602,16 @@ fail-if = (os == 'mac') || (os == 'win')
 skip-if = (os == 'mac' && os_version == '10.6')
 fail-if = (os == 'mac') || (os == 'linux') || (os == 'win')
 [generated/test_conformance__extensions__webgl-compressed-texture-atc.html]
 [generated/test_conformance__extensions__webgl-compressed-texture-etc.html]
 [generated/test_conformance__extensions__webgl-compressed-texture-pvrtc.html]
 [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]
 [generated/test_conformance__extensions__webgl-draw-buffers-framebuffer-unsupported.html]
 [generated/test_conformance__extensions__webgl-draw-buffers-max-draw-buffers.html]
 [generated/test_conformance__extensions__webgl-draw-buffers.html]
 skip-if = (os == 'linux')
 fail-if = (os == 'win')
--- a/dom/canvas/test/webgl-conf/mochitest-errata.ini
+++ b/dom/canvas/test/webgl-conf/mochitest-errata.ini
@@ -322,18 +322,16 @@ fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance2__textures__video__tex-3d-rgba8-rgba-unsigned_byte.html]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance2__textures__video__tex-3d-rgba8ui-rgba_integer-unsigned_byte.html]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance2__textures__video__tex-3d-srgb8-rgb-unsigned_byte.html]
 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]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance__textures__video__tex-2d-rgba-rgba-unsigned_byte.html]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance__textures__video__tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html]
 fail-if = (os == 'mac') || (os == 'win')
@@ -860,19 +858,16 @@ skip-if = (os == 'win')
 # Crashes on D3D11 debug.
 skip-if = (os == 'win')
 [generated/test_2_conformance2__glsl3__uniform-location-length-limits.html]
 # time out crash
 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')
 [generated/test_2_conformance2__attribs__gl-vertex-attrib-i-render.html]
 # timed out crash
 skip-if = (os == 'win')
 [generated/test_2_conformance__canvas__canvas-test.html]
 # this test is not always passed every time on opt and debug build
@@ -933,15 +928,12 @@ skip-if = (os == 'win' && os_version == 
 # Failure on win7 but got passed on win7 vm
 skip-if = (os == 'win' && os_version == '6.1')
 [generated/test_2_conformance__glsl__constructors__glsl-construct-vec4.html]
 # Failure on win7 but got passed on win7 vm
 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]
 skip-if = (os == 'win')