Bug 1399501 - Part4: Update mochitest-errata r?jgilbert
MozReview-Commit-ID: 47CsVyRggLF
--- a/dom/canvas/test/webgl-conf/generated-mochitest.ini
+++ b/dom/canvas/test/webgl-conf/generated-mochitest.ini
@@ -7661,17 +7661,16 @@ skip-if = (os == 'android')
[generated/test_conformance__glsl__bugs__nested-sequence-operator.html]
[generated/test_conformance__glsl__bugs__pow-of-small-constant-in-user-defined-function.html]
skip-if = (os == 'android')
[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')
[generated/test_conformance__glsl__bugs__qualcomm-loop-with-continue-crash.html]
[generated/test_conformance__glsl__bugs__sampler-array-using-loop-index.html]
-fail-if = (os == 'linux')
[generated/test_conformance__glsl__bugs__sampler-struct-function-arg.html]
skip-if = (os == 'linux') || (os == 'android')
[generated/test_conformance__glsl__bugs__sequence-operator-evaluation-order.html]
skip-if = (os == 'android')
[generated/test_conformance__glsl__bugs__sketchfab-lighting-shader-crash.html]
[generated/test_conformance__glsl__bugs__struct-constructor-highp-bug.html]
skip-if = (os == 'android')
[generated/test_conformance__glsl__bugs__temp-expressions-should-not-crash.html]
--- a/dom/canvas/test/webgl-conf/mochitest-errata.ini
+++ b/dom/canvas/test/webgl-conf/mochitest-errata.ini
@@ -100,21 +100,16 @@ skip-if = (os == 'linux') || (os == 'mac
# Assume crashes like ivec3
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)
-[generated/test_conformance__glsl__bugs__sampler-array-using-loop-index.html]
-# Testfail on Linux after removing SH_UNROLL_FOR_LOOP_WITH_SAMPLER_ARRAY_INDEX.
-# Only happen on tryserver
-fail-if = (os == 'linux')
-
[generated/test_conformance__misc__type-conversion-test.html]
fail-if = (os == 'linux')
# Resets device on Android 2.3.
# Crashes on B2G ICS Emulator, desktop Linux, and Mulet Linux x64.
skip-if = (os == 'android') || (os == 'b2g') || (os == 'linux')
[generated/test_conformance__misc__object-deletion-behaviour.html]
fail-if = (os == 'android')