From 0ee365e60aa94bbd011970d4d5f7f0bac68df64a Mon Sep 17 00:00:00 2001 From: Jeff Gilbert Date: Thu, 28 Jul 2016 14:36:17 -0700 Subject: [PATCH] Bug 1289653 - Mark tests. MozReview-Commit-ID: IWB8gBthP2v --- dom/canvas/test/webgl-conf/generated-mochitest.ini | 2 -- dom/canvas/test/webgl-conf/mochitest-errata.ini | 4 ---- 2 files changed, 6 deletions(-) diff --git a/dom/canvas/test/webgl-conf/generated-mochitest.ini b/dom/canvas/test/webgl-conf/generated-mochitest.ini index ef5af972c8fe..9268b8dbe04a 100644 --- a/dom/canvas/test/webgl-conf/generated-mochitest.ini +++ b/dom/canvas/test/webgl-conf/generated-mochitest.ini @@ -5838,7 +5838,6 @@ skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5. [generated/test_2_conformance__textures__misc__tex-image-with-invalid-data.html] skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2')) [generated/test_2_conformance__textures__misc__tex-sub-image-2d-bad-args.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__textures__misc__tex-sub-image-2d.html] skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2')) @@ -6722,7 +6721,6 @@ skip-if = (os == 'android') skip-if = (os == 'android') [generated/test_conformance__textures__misc__tex-input-validation.html] [generated/test_conformance__textures__misc__tex-sub-image-2d-bad-args.html] -fail-if = (os == 'mac') || (os == 'win') || (os == 'android') || (os == 'linux') [generated/test_conformance__textures__misc__tex-sub-image-2d.html] [generated/test_conformance__textures__misc__texparameter-test.html] [generated/test_conformance__textures__misc__texture-active-bind-2.html] diff --git a/dom/canvas/test/webgl-conf/mochitest-errata.ini b/dom/canvas/test/webgl-conf/mochitest-errata.ini index d964b8244396..fbeac0b4177c 100644 --- a/dom/canvas/test/webgl-conf/mochitest-errata.ini +++ b/dom/canvas/test/webgl-conf/mochitest-errata.ini @@ -148,8 +148,6 @@ fail-if = (os == 'mac') fail-if = (os == 'mac') || (os == 'win') [generated/test_2_conformance2__glsl3__forbidden-operators.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] @@ -160,8 +158,6 @@ fail-if = (os == 'mac') || (os == 'win') || (os == 'android') || (os == 'linux') 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_2_conformance__textures__misc__tex-sub-image-2d-bad-args.html] -fail-if = (os == 'mac') || (os == 'win') [generated/test_conformance__ogles__GL__biuDepthRange__biuDepthRange_001_to_002.html] fail-if = (os == 'android') || (os == 'linux') [generated/test_conformance__ogles__GL__gl_FragCoord__gl_FragCoord_001_to_003.html]