Bug 1324604 - Remark tests.
MozReview-Commit-ID: DY0nN96EO5z
--- a/dom/canvas/test/webgl-conf/generated-mochitest.ini
+++ b/dom/canvas/test/webgl-conf/generated-mochitest.ini
@@ -4581,17 +4581,16 @@ skip-if = (os == 'android' || os == 'lin
skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1'))
[generated/test_2_conformance2__samplers__sampler-drawing-test.html]
skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1'))
[generated/test_2_conformance2__samplers__samplers.html]
skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1'))
[generated/test_2_conformance2__state__gl-enum-tests.html]
skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1'))
[generated/test_2_conformance2__state__gl-get-calls.html]
-fail-if = (os == 'mac')
skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1'))
[generated/test_2_conformance2__state__gl-getstring.html]
skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1'))
[generated/test_2_conformance2__state__gl-object-get-calls.html]
skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1'))
[generated/test_2_conformance2__transform_feedback__transform_feedback.html]
skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1'))
[generated/test_2_conformance2__vertex_arrays__vertex-array-object.html]
@@ -5789,18 +5788,17 @@ skip-if = (os == 'android' || os == 'lin
skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1'))
[generated/test_2_conformance__rendering__simple.html]
skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1'))
[generated/test_2_conformance__rendering__triangle.html]
skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1'))
[generated/test_2_conformance__state__gl-enable-enum-test.html]
skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1'))
[generated/test_2_conformance__state__gl-get-calls.html]
-skip-if = (os == 'mac' && debug) || (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1'))
-fail-if = (os == 'mac')
+skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1'))
[generated/test_2_conformance__state__gl-geterror.html]
skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1'))
[generated/test_2_conformance__state__gl-initial-state.html]
skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1'))
[generated/test_2_conformance__state__state-uneffected-after-compositing.html]
skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1'))
[generated/test_2_conformance__textures__misc__copy-tex-image-2d-formats.html]
skip-if = (os == 'mac') || (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1'))
--- a/dom/canvas/test/webgl-conf/mochitest-errata.ini
+++ b/dom/canvas/test/webgl-conf/mochitest-errata.ini
@@ -528,35 +528,27 @@ fail-if = (os == 'mac' && os_version ==
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__state__gl-get-calls.html]
-fail-if = (os == 'mac')
[generated/test_conformance__extensions__angle-instanced-arrays.html]
fail-if = (os == 'mac')
[generated/test_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)
[generated/test_2_conformance__limits__gl-line-width.html]
skip-if = (os == 'mac')
[generated/test_2_conformance__misc__type-conversion-test.html]
skip-if = (os == 'mac' && debug)
-[generated/test_2_conformance__state__gl-get-calls.html]
-# Hit MOZ_GL_DEBUG_ABORT_ON_ERROR on debug build
-fail-if = (os == 'mac')
-skip-if = (os == 'mac' && debug)
-
-
########################################################################
########################################################################
# Win
[generated/test_2_conformance__ogles__GL__built_in_varying_array_out_of_bounds__built_in_varying_array_out_of_bounds_001_to_001.html]
# time out crash
skip-if = (os == 'win')
[generated/test_conformance__ogles__GL__built_in_varying_array_out_of_bounds__built_in_varying_array_out_of_bounds_001_to_001.html]