diff --git a/dom/canvas/test/webgl-conf/generated-mochitest.ini b/dom/canvas/test/webgl-conf/generated-mochitest.ini index 8885d13e3eab..f5764d9a4d77 100644 --- a/dom/canvas/test/webgl-conf/generated-mochitest.ini +++ b/dom/canvas/test/webgl-conf/generated-mochitest.ini @@ -10695,7 +10695,6 @@ skip-if = (os == 'mac') [generated/test_conformance__context__constants-and-properties.html] [generated/test_conformance__context__context-attribute-preserve-drawing-buffer.html] [generated/test_conformance__context__context-attributes-alpha-depth-stencil-antialias.html] -fail-if = (os == 'mac' && os_version == '10.6') skip-if = (os == 'linux') || (os == 'android') [generated/test_conformance__context__context-creation-and-destruction.html] [generated/test_conformance__context__context-creation.html] @@ -10859,12 +10858,9 @@ skip-if = (os == 'linux') || (os == 'mac') || (os == 'android') [generated/test_conformance__glsl__constructors__glsl-construct-ivec4.html] skip-if = (os == 'linux') || (os == 'mac') [generated/test_conformance__glsl__constructors__glsl-construct-mat2.html] -fail-if = (os == 'mac' && os_version == '10.6') skip-if = ((os == 'linux') && asan) [generated/test_conformance__glsl__constructors__glsl-construct-mat3.html] -fail-if = (os == 'mac' && os_version == '10.6') [generated/test_conformance__glsl__constructors__glsl-construct-mat4.html] -fail-if = (os == 'mac' && os_version == '10.6') [generated/test_conformance__glsl__constructors__glsl-construct-vec-mat-corner-cases.html] skip-if = (os == 'linux') [generated/test_conformance__glsl__constructors__glsl-construct-vec-mat-index.html] @@ -10905,7 +10901,6 @@ skip-if = (os == 'linux') [generated/test_conformance__glsl__functions__glsl-function-sin.html] [generated/test_conformance__glsl__functions__glsl-function-smoothstep-float.html] [generated/test_conformance__glsl__functions__glsl-function-smoothstep-gentype.html] -fail-if = (os == 'mac' && os_version == '10.8') [generated/test_conformance__glsl__functions__glsl-function-step-float.html] [generated/test_conformance__glsl__functions__glsl-function-step-gentype.html] skip-if = (os == 'android') @@ -10980,7 +10975,6 @@ skip-if = (os == 'android') [generated/test_conformance__glsl__literals__overflow_leak.vert.html] [generated/test_conformance__glsl__matrices__glsl-mat3-construction.html] [generated/test_conformance__glsl__matrices__glsl-mat4-to-mat3.html] -fail-if = (os == 'mac' && os_version == '10.6') [generated/test_conformance__glsl__matrices__matrix-compound-multiply.html] [generated/test_conformance__glsl__misc__attrib-location-length-limits.html] [generated/test_conformance__glsl__misc__boolean_precision.html] @@ -10992,7 +10986,6 @@ fail-if = (os == 'mac' && os_version == '10.6') [generated/test_conformance__glsl__misc__gl_position_unset.vert.html] [generated/test_conformance__glsl__misc__global-variable-init.html] [generated/test_conformance__glsl__misc__glsl-function-nodes.html] -fail-if = (os == 'mac' && os_version == '10.6') [generated/test_conformance__glsl__misc__glsl-long-variable-names.html] [generated/test_conformance__glsl__misc__glsl-vertex-branch.html] [generated/test_conformance__glsl__misc__large-loop-compile.html] @@ -11123,12 +11116,10 @@ skip-if = (os == 'android') [generated/test_conformance__glsl__variables__gl-fragdata-and-fragcolor.html] [generated/test_conformance__glsl__variables__gl-frontfacing.html] [generated/test_conformance__glsl__variables__gl-pointcoord.html] -fail-if = (os == 'mac' && os_version == '10.8') [generated/test_conformance__glsl__variables__glsl-built-ins.html] skip-if = (os == 'android') [generated/test_conformance__limits__gl-line-width.html] [generated/test_conformance__limits__gl-max-texture-dimensions.html] -fail-if = (os == 'mac' && os_version == '10.8') [generated/test_conformance__limits__gl-min-attribs.html] [generated/test_conformance__limits__gl-min-textures.html] skip-if = (os == 'linux') @@ -11364,11 +11355,8 @@ fail-if = (os == 'android') [generated/test_conformance__ogles__GL__struct__struct_017_to_024.html] [generated/test_conformance__ogles__GL__struct__struct_025_to_032.html] [generated/test_conformance__ogles__GL__struct__struct_033_to_040.html] -fail-if = (os == 'mac' && os_version == '10.6') [generated/test_conformance__ogles__GL__struct__struct_041_to_048.html] -fail-if = (os == 'mac' && os_version == '10.6') [generated/test_conformance__ogles__GL__struct__struct_049_to_056.html] -fail-if = (os == 'mac' && os_version == '10.6') [generated/test_conformance__ogles__GL__swizzlers__swizzlers_001_to_008.html] [generated/test_conformance__ogles__GL__swizzlers__swizzlers_009_to_016.html] [generated/test_conformance__ogles__GL__swizzlers__swizzlers_017_to_024.html] @@ -11697,7 +11685,7 @@ fail-if = (os == 'mac') [generated/test_conformance__uniforms__no-over-optimization-on-uniform-array-17.html] [generated/test_conformance__uniforms__null-uniform-location.html] [generated/test_conformance__uniforms__out-of-bounds-uniform-array-access.html] -skip-if = (os == 'android') || (os == 'mac' && os_version == '10.6') +skip-if = (os == 'android') [generated/test_conformance__uniforms__uniform-default-values.html] skip-if = (os == 'android') || (os == 'linux') || (os == 'win') [generated/test_conformance__uniforms__uniform-location.html] diff --git a/dom/canvas/test/webgl-conf/mochitest-errata.ini b/dom/canvas/test/webgl-conf/mochitest-errata.ini index 4908c4eb7153..ddd9b9f281a4 100644 --- a/dom/canvas/test/webgl-conf/mochitest-errata.ini +++ b/dom/canvas/test/webgl-conf/mochitest-errata.ini @@ -164,7 +164,6 @@ fail-if = 1 # Complicated [generated/test_conformance__context__context-attributes-alpha-depth-stencil-antialias.html] -fail-if = (os == 'mac' && os_version == '10.6') # Asserts on linux debug. Crashes on Android. skip-if = (os == 'linux') || (os == 'android') @@ -189,7 +188,6 @@ skip-if = (os == 'linux') || (os == 'mac') || (os == 'android') skip-if = (os == 'linux') || (os == 'mac') [generated/test_conformance__glsl__constructors__glsl-construct-mat2.html] -fail-if = (os == 'mac' && os_version == '10.6') # Crashes on Linux ASAN skip-if = ((os == 'linux') && asan) @@ -459,7 +457,7 @@ skip-if = (os == 'android') || debug skip-if = debug [generated/test_conformance__uniforms__out-of-bounds-uniform-array-access.html] # Crashes -skip-if = (os == 'android') || (os == 'mac' && os_version == '10.6') +skip-if = (os == 'android') [generated/test_conformance__glsl__samplers__glsl-function-texture2dproj.html] # Crashes skip-if = (os == 'android') @@ -665,32 +663,6 @@ skip-if = (os == 'mac') skip-if = (os == 'mac') -#################### -# 10.6 -[generated/test_conformance__glsl__constructors__glsl-construct-mat3.html] -fail-if = (os == 'mac' && os_version == '10.6') -[generated/test_conformance__glsl__constructors__glsl-construct-mat4.html] -fail-if = (os == 'mac' && os_version == '10.6') -[generated/test_conformance__glsl__matrices__glsl-mat4-to-mat3.html] -fail-if = (os == 'mac' && os_version == '10.6') -[generated/test_conformance__glsl__misc__glsl-function-nodes.html] -fail-if = (os == 'mac' && os_version == '10.6') -[generated/test_conformance__ogles__GL__struct__struct_033_to_040.html] -fail-if = (os == 'mac' && os_version == '10.6') -[generated/test_conformance__ogles__GL__struct__struct_041_to_048.html] -fail-if = (os == 'mac' && os_version == '10.6') -[generated/test_conformance__ogles__GL__struct__struct_049_to_056.html] -fail-if = (os == 'mac' && os_version == '10.6') - -#################### -# 10.8 -[generated/test_conformance__glsl__functions__glsl-function-smoothstep-gentype.html] -fail-if = (os == 'mac' && os_version == '10.8') -[generated/test_conformance__glsl__variables__gl-pointcoord.html] -fail-if = (os == 'mac' && os_version == '10.8') -[generated/test_conformance__limits__gl-max-texture-dimensions.html] -fail-if = (os == 'mac' && os_version == '10.8') - #################### # failure on OSX [generated/test_2_conformance2__renderbuffers__multisampled-depth-renderbuffer-initialization.html]