Merge m-c to fx-team a=merge CLOSED TREE
authorWes Kocher <wkocher@mozilla.com>
Mon, 18 Jul 2016 15:51:14 -0700
changeset 330556 62bb8900cfef139ac0ea2f9bc4db742166d6f9a5
parent 330555 7ccf33128023d24884aee9df86a556508b52d482 (current diff)
parent 330460 feaaf1af1065257b9178faca8b67eed9657b4a17 (diff)
child 330557 0cb14ba581524b331fd3f0c850695a963c6cc3e4
push id9858
push userjlund@mozilla.com
push dateMon, 01 Aug 2016 14:37:10 +0000
treeherdermozilla-aurora@203106ef6cb6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge
milestone50.0a1
Merge m-c to fx-team a=merge CLOSED TREE
--- a/dom/canvas/test/webgl-conf/generated-mochitest.ini
+++ b/dom/canvas/test/webgl-conf/generated-mochitest.ini
@@ -4483,17 +4483,16 @@ skip-if = (os == 'android' || os == 'lin
 [generated/test_2_conformance2__context__context-attributes-depth-stencil-antialias-obeyed.html]
 skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2'))
 [generated/test_2_conformance2__context__context-type-test-2.html]
 skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2'))
 [generated/test_2_conformance2__context__methods-2.html]
 skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2'))
 [generated/test_2_conformance2__extensions__ext-color-buffer-float.html]
 skip-if = (os == 'mac' && debug) || (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2'))
-fail-if = (os == 'mac')
 [generated/test_2_conformance2__extensions__promoted-extensions-in-shaders.html]
 skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2'))
 [generated/test_2_conformance2__extensions__promoted-extensions.html]
 skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2'))
 [generated/test_2_conformance2__glsl3__array-as-return-value.html]
 skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2'))
 [generated/test_2_conformance2__glsl3__array-assign-constructor.html]
 skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2'))
@@ -4556,17 +4555,16 @@ skip-if = (os == 'android' || os == 'lin
 skip-if = (os == 'mac') || (os == 'win') || (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2'))
 [generated/test_2_conformance2__query__occlusion-query.html]
 skip-if = (os == 'win') || (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2'))
 [generated/test_2_conformance2__query__query.html]
 skip-if = (os == 'win') || (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2'))
 [generated/test_2_conformance2__reading__read-pixels-from-fbo-test.html]
 skip-if = (os == 'mac') || (os == 'win') || (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2'))
 [generated/test_2_conformance2__reading__read-pixels-into-pixel-pack-buffer.html]
-fail-if = (os == 'mac') || (os == 'win')
 skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2'))
 [generated/test_2_conformance2__reading__read-pixels-pack-parameters.html]
 fail-if = (os == 'mac') || (os == 'win')
 skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2'))
 [generated/test_2_conformance2__renderbuffers__framebuffer-object-attachment.html]
 skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2'))
 [generated/test_2_conformance2__renderbuffers__framebuffer-test.html]
 skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2'))
@@ -4603,20 +4601,18 @@ skip-if = (os == 'android' || os == 'lin
 [generated/test_2_conformance2__state__gl-object-get-calls.html]
 skip-if = (os == 'mac') || (os == 'win') || (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2'))
 [generated/test_2_conformance2__transform_feedback__transform_feedback.html]
 skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2'))
 [generated/test_2_conformance2__vertex_arrays__vertex-array-object.html]
 fail-if = (os == 'mac') || (os == 'win')
 skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2'))
 [generated/test_2_conformance__attribs__gl-bindAttribLocation-aliasing.html]
-fail-if = (os == 'win')
 skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2'))
 [generated/test_2_conformance__attribs__gl-bindAttribLocation-matrix.html]
-fail-if = (os == 'win')
 skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2'))
 [generated/test_2_conformance__attribs__gl-bindAttribLocation-repeated.html]
 skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2'))
 [generated/test_2_conformance__attribs__gl-disabled-vertex-attrib.html]
 skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2'))
 [generated/test_2_conformance__attribs__gl-enable-vertex-attrib.html]
 skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2'))
 [generated/test_2_conformance__attribs__gl-matrix-attributes.html]
@@ -5741,20 +5737,18 @@ skip-if = (os == 'android' || os == 'lin
 skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2'))
 [generated/test_2_conformance__programs__program-test.html]
 skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2'))
 [generated/test_2_conformance__programs__use-program-crash-with-discard-in-fragment-shader.html]
 skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2'))
 [generated/test_2_conformance__reading__read-pixels-pack-alignment.html]
 skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2'))
 [generated/test_2_conformance__reading__read-pixels-test.html]
-fail-if = (os == 'mac') || (os == 'win')
 skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2'))
 [generated/test_2_conformance__renderbuffers__feedback-loop.html]
-fail-if = (os == 'mac') || (os == 'win')
 skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2'))
 [generated/test_2_conformance__renderbuffers__framebuffer-state-restoration.html]
 skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2'))
 [generated/test_2_conformance__renderbuffers__renderbuffer-initialization.html]
 skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2'))
 [generated/test_2_conformance__rendering__culling.html]
 skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2'))
 [generated/test_2_conformance__rendering__default-texture-draw-bug.html]
@@ -6663,17 +6657,16 @@ fail-if = (os == 'b2g')
 [generated/test_conformance__programs__gl-shader-test.html]
 [generated/test_conformance__programs__invalid-UTF-16.html]
 [generated/test_conformance__programs__program-test.html]
 fail-if = (os == 'android' && android_version == '10')
 [generated/test_conformance__programs__use-program-crash-with-discard-in-fragment-shader.html]
 [generated/test_conformance__reading__read-pixels-pack-alignment.html]
 [generated/test_conformance__reading__read-pixels-test.html]
 skip-if = (os == 'android') || (os == 'linux')
-fail-if = (os == 'mac') || (os == 'win')
 [generated/test_conformance__renderbuffers__feedback-loop.html]
 [generated/test_conformance__renderbuffers__framebuffer-object-attachment.html]
 skip-if = (os == 'android')
 [generated/test_conformance__renderbuffers__framebuffer-state-restoration.html]
 [generated/test_conformance__renderbuffers__framebuffer-test.html]
 [generated/test_conformance__renderbuffers__renderbuffer-initialization.html]
 [generated/test_conformance__rendering__culling.html]
 [generated/test_conformance__rendering__default-texture-draw-bug.html]
--- a/dom/canvas/test/webgl-conf/mochitest-errata.ini
+++ b/dom/canvas/test/webgl-conf/mochitest-errata.ini
@@ -136,48 +136,42 @@ skip-if = (os == 'android') || (os == 'w
 fail-if = (os == 'mac')
 skip-if = (os == 'win')
 [generated/test_2_conformance__extensions__webgl-compressed-texture-s3tc.html]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance2__misc__instanceof-test.html]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance__textures__misc__tex-image-with-invalid-data.html]
 fail-if = (os == 'mac') || (os == 'win')
-[generated/test_2_conformance2__reading__read-pixels-into-pixel-pack-buffer.html]
-fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance2__samplers__sampler-drawing-test.html]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance2__buffers__buffer-type-restrictions.html]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance2__rendering__draw-buffers.html]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance2__samplers__samplers.html]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance__textures__misc__tex-image-with-format-and-type.html]
 fail-if = (os == 'mac')
 [generated/test_2_conformance__attribs__gl-vertexattribpointer.html]
 fail-if = (os == 'mac') || (os == 'win')
-[generated/test_2_conformance__reading__read-pixels-test.html]
-fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance2__buffers__buffer-copying-restrictions.html]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance2__glsl3__forbidden-operators.html]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance__buffers__buffer-data-and-buffer-sub-data.html]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_conformance__textures__misc__tex-sub-image-2d-bad-args.html]
 fail-if = (os == 'mac') || (os == 'win') || (os == 'android') || (os == 'linux')
 [generated/test_2_conformance2__vertex_arrays__vertex-array-object.html]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance__rendering__negative-one-index.html]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_conformance__extensions__oes-texture-half-float.html]
 fail-if = (os == 'mac') || (os == 'win') || (os == 'android') || (os == 'linux')
-[generated/test_2_conformance__renderbuffers__feedback-loop.html]
-fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance2__buffers__buffer-copying-contents.html]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance2__reading__read-pixels-pack-parameters.html]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_conformance__attribs__gl-vertexattribpointer.html]
 fail-if = (os == 'mac') || (os == 'win') || (os == 'android') || (os == 'linux')
 [generated/test_conformance__buffers__buffer-data-and-buffer-sub-data.html]
 fail-if = (os == 'mac') || (os == 'win') || (os == 'android') || (os == 'linux')
@@ -244,17 +238,16 @@ skip-if = (os == 'android') || (os == 'l
 fail-if = (os == 'android') || (os == 'linux')
 [generated/test_conformance__ogles__GL__sin__sin_001_to_006.html]
 fail-if = (os == 'android') || (os == 'linux')
 [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')
-fail-if = (os == 'mac') || (os == 'win')
 [generated/test_conformance__textures__misc__texture-upload-size.html]
 # application crashed [@ mozilla::WebGLTexture::TexSubImage]
 skip-if = (os == 'win') || (os == 'android')
 
 ########################################################################
 ########################################################################
 # Android
 
@@ -574,17 +567,16 @@ fail-if = (os == 'mac')
 [generated/test_2_conformance2__state__gl-get-calls.html]
 fail-if = (os == 'mac')
 [generated/test_conformance__extensions__angle-instanced-arrays.html]
 fail-if = (os == 'mac')
 [generated/test_2_conformance__rendering__point-size.html]
 fail-if = (os == 'mac')
 
 [generated/test_2_conformance2__extensions__ext-color-buffer-float.html]
-fail-if = (os == 'mac')
 skip-if = (os == 'mac' && debug)
 [generated/test_2_conformance__limits__gl-line-width.html]
 skip-if = (os == 'mac')
 [generated/test_2_conformance__misc__type-conversion-test.html]
 skip-if = (os == 'mac' && debug)
 [generated/test_2_conformance__state__gl-get-calls.html]
 # Hit MOZ_GL_DEBUG_ABORT_ON_ERROR on debug build
 fail-if = (os == 'mac')
@@ -691,14 +683,10 @@ skip-if = (os == 'win' && os_version == 
 skip-if = (os == 'win' && os_version == '6.1')
 
 ####################
 # failure on Windows
 [generated/test_conformance__rendering__point-specific-shader-variables.html]
 fail-if = (os == 'win' && os_version != '5.1')
 [generated/test_2_conformance__canvas__rapid-resizing.html]
 fail-if = (os == 'win')
-[generated/test_2_conformance__attribs__gl-bindAttribLocation-aliasing.html]
-fail-if = (os == 'win')
-[generated/test_2_conformance__attribs__gl-bindAttribLocation-matrix.html]
-fail-if = (os == 'win')
 [generated/test_conformance__glsl__bugs__floor-div-cos-should-not-truncate.html]
-fail-if = (os == 'win' && os_version == '5.1')
\ No newline at end of file
+fail-if = (os == 'win' && os_version == '5.1')