Bug 1406448 - Skip test_conformance__glsl__misc__shader-uniform-packing-restrictions.html on Win7 debug for frequent failures. r=RyanVM
authorEmilio Cobos Álvarez <emilio@crisal.io>
Thu, 19 Oct 2017 20:02:35 -0400
changeset 683860 f0832773e45106bccf83d35fec16066670e5823a
parent 683859 fbdb84f3a8c4bebf0b179d395c8d400f2358067e
child 683861 6a815fb0b667075041404ebd0b1ee7b87f46e3a2
push id85474
push userbmo:emilio@crisal.io
push dateFri, 20 Oct 2017 10:02:12 +0000
reviewersRyanVM
bugs1406448
milestone58.0a1
Bug 1406448 - Skip test_conformance__glsl__misc__shader-uniform-packing-restrictions.html on Win7 debug for frequent failures. r=RyanVM
dom/canvas/test/webgl-conf/generated-mochitest.ini
dom/canvas/test/webgl-conf/mochitest-errata.ini
--- 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')
+skip-if = (os == 'android') || (os == 'win' && os_version == '6.1' && 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,17 +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]
-skip-if = (os == 'android')
+# Frequent timeout on win7 debug.
+skip-if = (os == 'android') || (os == 'win' && os_version == '6.1' && 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