Bug 1355321 - Part3: Add fail-if to prevent orange light on tryserver; r?jgilbert draft
authorChih-Yi Leu <cleu@mozilla.com>
Thu, 13 Apr 2017 17:58:16 +0800
changeset 562585 95cdc40d65683b14edccaa5bdf7b63f103a3f743
parent 562584 393b58269546bf4c56d70b1b1cef93826fd9d4c6
child 624263 a0ad78e65d50ed59baf5f1f425a32910bd4440fd
push id54054
push userbmo:cleu@mozilla.com
push dateFri, 14 Apr 2017 02:55:19 +0000
reviewersjgilbert
bugs1355321
milestone55.0a1
Bug 1355321 - Part3: Add fail-if to prevent orange light on tryserver; r?jgilbert MozReview-Commit-ID: DrLjYVTakVl
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
@@ -7665,16 +7665,17 @@ 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,16 +100,21 @@ 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')