From 8181ee70ac03b4efba63524bd4f1d508ed0476d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= Date: Fri, 20 Oct 2017 21:33:43 +0200 Subject: [PATCH] Bug 1410396: Skip test_conformance__glsl__misc__shader-uniform-packing-restrictions.html on Linux debug too. rpending=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 --- dom/canvas/test/webgl-conf/generated-mochitest.ini | 2 +- dom/canvas/test/webgl-conf/mochitest-errata.ini | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dom/canvas/test/webgl-conf/generated-mochitest.ini b/dom/canvas/test/webgl-conf/generated-mochitest.ini index ea27cf0350fb..7961c701ad46 100644 --- a/dom/canvas/test/webgl-conf/generated-mochitest.ini +++ b/dom/canvas/test/webgl-conf/generated-mochitest.ini @@ -7835,7 +7835,7 @@ fail-if = (os == 'android' && android_version == '10') [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] diff --git a/dom/canvas/test/webgl-conf/mochitest-errata.ini b/dom/canvas/test/webgl-conf/mochitest-errata.ini index 063979cfd359..700055707f83 100644 --- a/dom/canvas/test/webgl-conf/mochitest-errata.ini +++ b/dom/canvas/test/webgl-conf/mochitest-errata.ini @@ -533,8 +533,8 @@ 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')