Bug 1446809 - Remove some b2g leftover in some webgl tests r?jgilbert
MozReview-Commit-ID: Etx3KYygQgl
--- a/dom/canvas/test/webgl-conf/generated-mochitest.ini
+++ b/dom/canvas/test/webgl-conf/generated-mochitest.ini
@@ -1,15 +1,15 @@
# This is a GENERATED FILE. Do not edit it directly.
# Regenerated it by using `python generate-wrappers-and-manifest.py`.
# Mark failing (fail-if) and crashing (skip-if) tests in mochitest-errata.ini.
[DEFAULT]
subsuite = webgl
-skip-if = os == 'b2g' || ((os == 'linux') && (buildapp == 'mulet'))
+skip-if = (os == 'linux') && (buildapp == 'mulet')
support-files = always-fail.html
checkout/00_test_list.txt
checkout/CONFORMANCE_RULES.txt
checkout/README.md
checkout/closure-library/AUTHORS
checkout/closure-library/CONTRIBUTING
checkout/closure-library/LICENSE
@@ -7532,17 +7532,17 @@ skip-if = (os == 'mac')
skip-if = (os == 'android')
[generated/test_conformance__canvas__texture-bindings-unaffected-on-resize.html]
[generated/test_conformance__canvas__to-data-url-test.html]
[generated/test_conformance__canvas__viewport-unchanged-upon-resize.html]
skip-if = (os == 'mac')
[generated/test_conformance__context__constants-and-properties.html]
[generated/test_conformance__context__context-attribute-preserve-drawing-buffer.html]
[generated/test_conformance__context__context-attributes-alpha-depth-stencil-antialias.html]
-skip-if = (os == 'b2g') || (os == 'linux') || (os == 'android')
+skip-if = (os == 'linux') || (os == 'android')
fail-if = (os == 'mac' && os_version == '10.6')
[generated/test_conformance__context__context-creation-and-destruction.html]
[generated/test_conformance__context__context-creation.html]
skip-if = (os == 'android')
[generated/test_conformance__context__context-eviction-with-garbage-collection.html]
skip-if = (os == 'android')
[generated/test_conformance__context__context-hidden-alpha.html]
[generated/test_conformance__context__context-lost-restored.html]
@@ -7926,22 +7926,20 @@ fail-if = (os == 'android')
[generated/test_conformance__glsl__misc__struct-specifiers-in-uniforms.html]
[generated/test_conformance__glsl__misc__struct-unary-operators.html]
[generated/test_conformance__glsl__misc__ternary-operator-on-arrays.html]
[generated/test_conformance__glsl__misc__ternary-operators-in-global-initializers.html]
[generated/test_conformance__glsl__misc__ternary-operators-in-initializers.html]
[generated/test_conformance__glsl__misc__uniform-location-length-limits.html]
[generated/test_conformance__glsl__reserved___webgl_field.vert.html]
[generated/test_conformance__glsl__reserved___webgl_function.vert.html]
-fail-if = (os == 'b2g')
[generated/test_conformance__glsl__reserved___webgl_struct.vert.html]
[generated/test_conformance__glsl__reserved___webgl_variable.vert.html]
[generated/test_conformance__glsl__reserved__webgl_field.vert.html]
[generated/test_conformance__glsl__reserved__webgl_function.vert.html]
-fail-if = (os == 'b2g')
[generated/test_conformance__glsl__reserved__webgl_struct.vert.html]
[generated/test_conformance__glsl__reserved__webgl_variable.vert.html]
[generated/test_conformance__glsl__samplers__glsl-function-texture2d-bias.html]
[generated/test_conformance__glsl__samplers__glsl-function-texture2dlod.html]
[generated/test_conformance__glsl__samplers__glsl-function-texture2dproj.html]
skip-if = (os == 'android')
[generated/test_conformance__glsl__samplers__glsl-function-texture2dprojlod.html]
skip-if = (os == 'android')
@@ -7963,31 +7961,30 @@ skip-if = (os == 'linux')
[generated/test_conformance__limits__gl-min-uniforms.html]
[generated/test_conformance__misc__bad-arguments-test.html]
skip-if = (os == 'mac') || (os == 'win') || (os == 'linux') || (os == 'android')
[generated/test_conformance__misc__boolean-argument-conversion.html]
skip-if = (os == 'android')
[generated/test_conformance__misc__delayed-drawing.html]
skip-if = (os == 'android' && android_version == '10')
[generated/test_conformance__misc__error-reporting.html]
-fail-if = (os == 'b2g')
[generated/test_conformance__misc__expando-loss.html]
[generated/test_conformance__misc__functions-returning-strings.html]
[generated/test_conformance__misc__instanceof-test.html]
[generated/test_conformance__misc__invalid-passed-params.html]
skip-if = (os == 'android') || (os == 'linux')
[generated/test_conformance__misc__is-object.html]
[generated/test_conformance__misc__null-object-behaviour.html]
[generated/test_conformance__misc__object-deletion-behaviour.html]
skip-if = (os == 'android' && debug)
fail-if = (os == 'android')
[generated/test_conformance__misc__shader-precision-format.html]
skip-if = (os == 'android')
[generated/test_conformance__misc__type-conversion-test.html]
-skip-if = (os == 'android') || (os == 'b2g') || (os == 'linux')
+skip-if = (os == 'android') || (os == 'linux')
fail-if = (os == 'linux')
[generated/test_conformance__misc__uninitialized-test.html]
skip-if = (os == 'android')
[generated/test_conformance__misc__webgl-specific.html]
[generated/test_conformance__more__conformance__constants.html]
[generated/test_conformance__more__conformance__getContext.html]
[generated/test_conformance__more__conformance__methods.html]
[generated/test_conformance__more__conformance__quickCheckAPI-A.html]
@@ -8203,17 +8200,16 @@ fail-if = (os == 'mac' && os_version ==
[generated/test_conformance__ogles__GL__swizzlers__swizzlers_105_to_112.html]
[generated/test_conformance__ogles__GL__swizzlers__swizzlers_113_to_120.html]
[generated/test_conformance__ogles__GL__tan__tan_001_to_006.html]
[generated/test_conformance__ogles__GL__vec3__vec3_001_to_008.html]
[generated/test_conformance__ogles__GL__vec__vec_001_to_008.html]
[generated/test_conformance__ogles__GL__vec__vec_009_to_016.html]
[generated/test_conformance__ogles__GL__vec__vec_017_to_018.html]
[generated/test_conformance__programs__get-active-test.html]
-fail-if = (os == 'b2g')
[generated/test_conformance__programs__gl-bind-attrib-location-long-names-test.html]
[generated/test_conformance__programs__gl-bind-attrib-location-test.html]
[generated/test_conformance__programs__gl-get-active-attribute.html]
[generated/test_conformance__programs__gl-get-active-uniform.html]
[generated/test_conformance__programs__gl-getshadersource.html]
[generated/test_conformance__programs__gl-shader-test.html]
[generated/test_conformance__programs__invalid-UTF-16.html]
[generated/test_conformance__programs__program-infolog.html]
--- a/dom/canvas/test/webgl-conf/mochitest-errata.ini
+++ b/dom/canvas/test/webgl-conf/mochitest-errata.ini
@@ -18,19 +18,18 @@
# https://msdn.microsoft.com/en-us/library/windows/desktop/ms724832%28v=vs.85%29.aspx
# * Windows 7: 6.1
# * Windows 8: 6.2
# * Windows 8.1: 6.3
# * Windows 10: 10.0
[DEFAULT]
subsuite = webgl
-# Skip B2G for now, until we get a handle on the longer tail of emulator bugs.
# Bug 1136181 disabled on Mulet for intermittent failures
-skip-if = os == 'b2g' || ((os == 'linux') && (buildapp == 'mulet'))
+skip-if = (os == 'linux') && (buildapp == 'mulet')
[generated/test_..__always-fail.html]
fail-if = 1
####################
# Tests requesting non-local network connections.
[generated/test_conformance__more__functions__readPixelsBadArgs.html]
@@ -71,18 +70,18 @@ skip-if = (os == 'android') || (os == 'l
# Timeout on D3D11
skip-if = (os == 'win')
########################################################################
# Complicated
[generated/test_conformance__context__context-attributes-alpha-depth-stencil-antialias.html]
fail-if = (os == 'mac' && os_version == '10.6')
-# Asserts on 'B2G ICS Emulator Debug' and linux debug. Crashes on Android.
-skip-if = (os == 'b2g') || (os == 'linux') || (os == 'android')
+# Asserts on linux debug. Crashes on Android.
+skip-if = (os == 'linux') || (os == 'android')
[generated/test_conformance__extensions__webgl-draw-buffers.html]
# Crashes
skip-if = (os == 'linux')
[generated/test_conformance__glsl__constructors__glsl-construct-bvec3.html]
# Crashes from libglsl.so
# application crashed [@ jemalloc_crash] on Android
@@ -107,18 +106,18 @@ 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')
+# Crashes on desktop Linux, and Mulet Linux x64.
+skip-if = (os == 'android') || (os == 'linux')
[generated/test_conformance__misc__object-deletion-behaviour.html]
fail-if = (os == 'android')
# void mozilla::gl::GLContext::fDetachShader(GLuint, GLuint): Generated unexpected GL_INVALID_VALUE error. (0x0501)
skip-if = (os == 'android' && debug)
[generated/test_conformance__extensions__oes-vertex-array-object.html]
fail-if = (os == 'mac') || (os == 'linux') || (os == 'win')
@@ -333,36 +332,34 @@ fail-if = (os == 'mac') || (os == 'win')
[generated/test_2_conformance__textures__video__tex-2d-rgba-rgba-unsigned_byte.html]
fail-if = (os == 'mac') || (os == 'win')
[generated/test_2_conformance__textures__video__tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html]
fail-if = (os == 'mac') || (os == 'win')
[generated/test_2_conformance__textures__video__tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html]
fail-if = (os == 'mac') || (os == 'win')
########################################################################
# "tst-linux{32,64}-spot-NNN" Slaves:
-# Android 2.3, B2G Emu, Linux, and Mulet.
+# Android 2.3, Linux, and Mulet.
# Android: os == 'android'. (Not enough info to separate out 2.3)
-# B2G Emu: os == 'b2g'.
# Linux: os == 'linux'.
-# Mulet: os == 'b2g' && buildapp == 'mulet'.
+# Mulet: buildapp == 'mulet'.
[generated/test_conformance__glsl__bugs__temp-expressions-should-not-crash.html]
# Coincidentally enough, crashes on Linux and Android 4.0.
skip-if = (os == 'android') || (os == 'linux')
[generated/test_conformance__misc__invalid-passed-params.html]
# Causes consistent *blues*: "DMError: Remote Device Error: unable to
# connect to 127.0.0.1 after 5 attempts" on 'Android 2.3 Opt'.
skip-if = (os == 'android') || (os == 'linux')
[generated/test_conformance__ogles__GL__functions__functions_001_to_008.html]
fail-if = (os == 'android')
[generated/test_conformance__ogles__GL__sin__sin_001_to_006.html]
fail-if = (os == 'android')
[generated/test_conformance__reading__read-pixels-test.html]
# Causes consistent *blues*: "DMError: Remote Device Error: unable to
# connect to 127.0.0.1 after 5 attempts" on 'Android 2.3 Opt'.
-# Crashes near on B2G ICS Emulator.
skip-if = (os == 'android') || (os == 'linux')
[generated/test_conformance__textures__misc__texture-upload-size.html]
# application crashed [@ mozilla::WebGLTexture::TexSubImage]
skip-if = (os == 'win') || (os == 'android')
########################################################################
########################################################################
# Android
@@ -578,26 +575,20 @@ skip-if = (os == 'android')
# Crashes
skip-if = (os == 'android')
[generated/test_conformance__renderbuffers__framebuffer-object-attachment.html]
# Crashes
skip-if = (os == 'android')
########################################################################
########################################################################
-# B2G
[generated/test_conformance__glsl__reserved___webgl_function.vert.html]
-fail-if = (os == 'b2g')
[generated/test_conformance__glsl__reserved__webgl_function.vert.html]
-fail-if = (os == 'b2g')
[generated/test_conformance__misc__error-reporting.html]
-fail-if = (os == 'b2g')
[generated/test_conformance__programs__get-active-test.html]
-fail-if = (os == 'b2g')
-
########################################################################
########################################################################
# Linux
[generated/test_conformance__glsl__constructors__glsl-construct-vec-mat-corner-cases.html]
# mozalloc_abort in libglsl.so
skip-if = (os == 'linux')
[generated/test_conformance__glsl__constructors__glsl-construct-vec3.html]