diff --git a/dom/canvas/test/webgl-conf/generated-mochitest.ini b/dom/canvas/test/webgl-conf/generated-mochitest.ini index 7afdfaf9a95e..1910b0a113f4 100644 --- a/dom/canvas/test/webgl-conf/generated-mochitest.ini +++ b/dom/canvas/test/webgl-conf/generated-mochitest.ini @@ -4510,7 +4510,6 @@ skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5. [generated/test_2_conformance2__glsl3__const-array-init.html] skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1')) [generated/test_2_conformance2__glsl3__forbidden-operators.html] -fail-if = (os == 'mac') || (os == 'win') skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1')) [generated/test_2_conformance2__glsl3__frag-depth.html] skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1')) @@ -5216,7 +5215,6 @@ skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5. [generated/test_2_conformance__glsl__misc__shaders-with-constant-expression-loop-conditions.html] skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1')) [generated/test_2_conformance__glsl__misc__shaders-with-invariance.html] -fail-if = (os == 'mac') skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1')) [generated/test_2_conformance__glsl__misc__shaders-with-mis-matching-uniforms.html] skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1')) @@ -6097,7 +6095,6 @@ skip-if = (os == 'android') skip-if = (os == 'android') [generated/test_conformance__glsl__bugs__pow-of-small-constant-in-user-defined-function.html] skip-if = (os == 'android') -fail-if = (os == 'win' && os_version != '5.1') [generated/test_conformance__glsl__bugs__pow-with-constant-exponent-should-not-crash.html] [generated/test_conformance__glsl__bugs__qualcomm-crash.html] skip-if = (os == 'android') @@ -6695,7 +6692,6 @@ skip-if = (os == 'mac') || (os == 'android') || (os == 'win') [generated/test_conformance__rendering__point-no-attributes.html] [generated/test_conformance__rendering__point-size.html] [generated/test_conformance__rendering__point-specific-shader-variables.html] -fail-if = (os == 'win' && os_version != '5.1') [generated/test_conformance__rendering__point-with-gl-pointcoord-in-fragment-shader.html] [generated/test_conformance__rendering__polygon-offset.html] [generated/test_conformance__rendering__simple.html] diff --git a/dom/canvas/test/webgl-conf/mochitest-errata.ini b/dom/canvas/test/webgl-conf/mochitest-errata.ini index 4f8f21c67671..76a14267bb19 100644 --- a/dom/canvas/test/webgl-conf/mochitest-errata.ini +++ b/dom/canvas/test/webgl-conf/mochitest-errata.ini @@ -146,8 +146,6 @@ fail-if = (os == 'mac') || (os == 'win') fail-if = (os == 'mac') [generated/test_2_conformance__attribs__gl-vertexattribpointer.html] fail-if = (os == 'mac') || (os == 'win') -[generated/test_2_conformance2__glsl3__forbidden-operators.html] -fail-if = (os == 'mac') || (os == 'win') [generated/test_2_conformance2__vertex_arrays__vertex-array-object.html] fail-if = (os == 'mac') || (os == 'win') [generated/test_2_conformance__rendering__negative-one-index.html] @@ -192,7 +190,6 @@ skip-if = (os == 'linux') || (os == 'android') # mozalloc_abort in libglsl.so skip-if = (os == 'linux') || (os == 'android') [generated/test_conformance__glsl__bugs__pow-of-small-constant-in-user-defined-function.html] -fail-if = (os == 'win' && os_version != '5.1') skip-if = (os == 'android') ######################################################################## # "tst-linux{32,64}-spot-NNN" Slaves: @@ -550,8 +547,6 @@ fail-if = (os == 'mac') fail-if = (os == 'mac') [generated/test_conformance__glsl__misc__shaders-with-invariance.html] fail-if = (os == 'mac') -[generated/test_2_conformance__glsl__misc__shaders-with-invariance.html] -fail-if = (os == 'mac') [generated/test_2_conformance2__extensions__ext-color-buffer-float.html] skip-if = (os == 'mac' && debug) @@ -679,8 +674,6 @@ skip-if = (os == 'win' && os_version == '6.2') #################### # failure on Windows -[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' && os_version == '5.1') [generated/test_conformance__glsl__bugs__floor-div-cos-should-not-truncate.html]