Bug 1410396: Skip test_conformance__glsl__misc__shader-uniform-packing-restrictions.html on Linux debug too. r?jgilbert
Since it's timing out very frequently on central, and apparently the culprit is
bug 1409088, which just added a relatively expensive assertion in layout.
Since that assertion has caught at least two bugs already since it landed, I
really don't want to remove it...
MozReview-Commit-ID: JVeAVKZe1PE
--- a/dom/canvas/test/webgl-conf/generated-mochitest.ini
+++ b/dom/canvas/test/webgl-conf/generated-mochitest.ini
@@ -7830,17 +7830,17 @@ fail-if = (os == 'mac' && os_version ==
[generated/test_conformance__glsl__misc__non-ascii-comments.vert.html]
[generated/test_conformance__glsl__misc__non-ascii.vert.html]
[generated/test_conformance__glsl__misc__re-compile-re-link.html]
fail-if = (os == 'android' && android_version == '10')
[generated/test_conformance__glsl__misc__sequence-operator-returns-constant.html]
[generated/test_conformance__glsl__misc__shader-precision-format-obeyed.html]
[generated/test_conformance__glsl__misc__shader-struct-scope.html]
[generated/test_conformance__glsl__misc__shader-uniform-packing-restrictions.html]
-skip-if = (os == 'android') || (os == 'win' && os_version == '6.1' && debug)
+skip-if = (os == 'android') || (os == 'win' && os_version == '6.1' && debug) || (os == 'linux' && debug)
[generated/test_conformance__glsl__misc__shader-varying-packing-restrictions.html]
[generated/test_conformance__glsl__misc__shader-with-256-character-define.html]
[generated/test_conformance__glsl__misc__shader-with-256-character-identifier.frag.html]
[generated/test_conformance__glsl__misc__shader-with-257-character-define.html]
[generated/test_conformance__glsl__misc__shader-with-257-character-identifier.frag.html]
[generated/test_conformance__glsl__misc__shader-with-_webgl-identifier.vert.html]
[generated/test_conformance__glsl__misc__shader-with-arbitrary-indexing.frag.html]
[generated/test_conformance__glsl__misc__shader-with-arbitrary-indexing.vert.html]
--- a/dom/canvas/test/webgl-conf/mochitest-errata.ini
+++ b/dom/canvas/test/webgl-conf/mochitest-errata.ini
@@ -528,18 +528,18 @@ fail-if = (os == 'android' && android_ve
skip-if = (os == 'android')
####################
# Timeouts
[generated/test_conformance__context__context-release-upon-reload.html]
skip-if = (os == 'android')
[generated/test_conformance__context__context-release-with-workers.html]
skip-if = (os == 'android')
[generated/test_conformance__glsl__misc__shader-uniform-packing-restrictions.html]
-# Frequent timeout on win7 debug.
-skip-if = (os == 'android') || (os == 'win' && os_version == '6.1' && debug)
+# Frequent timeout on win7 and linux debug.
+skip-if = (os == 'android') || (os == 'win' && os_version == '6.1' && debug) || (os == 'linux' && debug)
[generated/test_conformance__glsl__bugs__complex-glsl-does-not-crash.html]
skip-if = (os == 'android')
[generated/test_conformance__glsl__misc__shader-with-non-reserved-words.html]
fail-if = (os == 'android')
# (TODO) Generates results after calling finish()
skip-if = 1