From de82ad999a51c77bd82602de16c316b12d7b2990 Mon Sep 17 00:00:00 2001 From: "Carsten \"Tomcat\" Book" Date: Wed, 13 Jul 2016 15:35:49 +0200 Subject: [PATCH] Backed out changeset 0e4bd24e7d80 (bug 1277424) --- .../test/webgl-conf/mochitest-errata.ini | 68 +++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/dom/canvas/test/webgl-conf/mochitest-errata.ini b/dom/canvas/test/webgl-conf/mochitest-errata.ini index f53a90565367..3092948f6a46 100644 --- a/dom/canvas/test/webgl-conf/mochitest-errata.ini +++ b/dom/canvas/test/webgl-conf/mochitest-errata.ini @@ -39,6 +39,8 @@ fail-if = 1 [generated/test_conformance__glsl__misc__shaders-with-name-conflicts.html] [generated/test_conformance__renderbuffers__feedback-loop.html] fail-if = 1 +[generated/test_conformance__textures__texture-copying-feedback-loops.html] +fail-if = 1 #################### # Tests requesting non-local network connections. @@ -47,6 +49,10 @@ fail-if = 1 # (TODO) FATAL ERROR: Non-local network connections are disabled and a connection attempt to www.opengl.org (45.55.206.190) was made. skip-if = 1 +[generated/test_conformance__textures__origin-clean-conformance.html] +# (TODO) FATAL ERROR: Non-local network connections are disabled and a connection attempt to www.opengl.org (104.131.58.36) was made. +skip-if = 1 + [generated/test_conformance__more__functions__texImage2DHTML.html] # (TODO) FATAL ERROR: Non-local network connections are disabled and a connection attempt to mashable.com (88.221.93.55) was made. skip-if = 1 @@ -57,6 +63,15 @@ skip-if = 1 #################### # Timing out +[generated/test_conformance__textures__gl-teximage.html] +skip-if = 1 +[generated/test_conformance__textures__texture-npot-video.html] +skip-if = 1 + +[generated/test_conformance__textures__texture-transparent-pixels-initialized.html] +skip-if = 1 +[generated/test_conformance__textures__texture-upload-size.html] +skip-if = 1 [generated/test_conformance__uniforms__uniform-default-values.html] # Timeout on Windows, crash on Android/Linux. skip-if = (os == 'android') || (os == 'linux') || (os == 'win') @@ -107,6 +122,16 @@ 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__textures__texture-npot.html] +fail-if = (os == 'android') +# void mozilla::gl::GLContext::fGenerateMipmap(GLenum): Generated unexpected GL_INVALID_ENUM error. (0x0500) +skip-if = (os == 'android' && debug) + +[generated/test_conformance__textures__texture-size.html] +fail-if = (os == 'android') || (os == 'mac' && os_version == '10.8') || (os == 'b2g') +# void mozilla::gl::GLContext::fGenerateMipmap(GLenum): Generated unexpected GL_INVALID_ENUM error. (0x0500) +skip-if = (os == 'android' && debug) + ######################################################################## # "tst-linux{32,64}-spot-NNN" Slaves: # Android 2.3, B2G Emu, Linux, and Mulet. @@ -130,6 +155,11 @@ fail-if = (os == 'android') || (os == 'linux') # 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__tex-input-validation.html] +# Crashes on 'Android 2.3' +# Asserts on 'B2G ICS Emulator Debug'. +skip-if = (os == 'android') || (os == 'linux') + ######################################################################## ######################################################################## # Android @@ -160,6 +190,27 @@ fail-if = (os == 'android') fail-if = (os == 'android') [generated/test_conformance__extensions__oes-texture-half-float-with-video.html] fail-if = (os == 'android') +[generated/test_conformance__textures__texture-mips.html] +fail-if = (os == 'android') +# void mozilla::gl::GLContext::fGenerateMipmap(GLenum): Generated unexpected GL_INVALID_ENUM error. (0x0500) +skip-if = (os == 'android' && debug) +[generated/test_conformance__textures__texture-size-cube-maps.html] +fail-if = (os == 'android') +# void mozilla::gl::GLContext::fGenerateMipmap(GLenum): Generated unexpected GL_INVALID_ENUM error. (0x0500) +skip-if = (os == 'android' && debug) +[generated/test_conformance__textures__tex-image-and-sub-image-2d-with-video-rgb565.html] +fail-if = (os == 'android') +[generated/test_conformance__textures__tex-image-and-sub-image-2d-with-video-rgba4444.html] +fail-if = (os == 'android') +[generated/test_conformance__textures__tex-image-and-sub-image-2d-with-video-rgba5551.html] +fail-if = (os == 'android') +[generated/test_conformance__textures__tex-image-and-sub-image-2d-with-video.html] +fail-if = (os == 'android') + +[generated/test_conformance__textures__texture-sub-image-cube-maps.html] +fail-if = (os == 'android') +# void mozilla::gl::GLContext::fGenerateMipmap(GLenum): Generated unexpected GL_INVALID_ENUM error. (0x0500) +skip-if = (os == 'android' && debug) [generated/test_conformance__canvas__buffer-offscreen-test.html] # Causes frequent *blues*: "DMError: Remote Device Error: unable to @@ -170,6 +221,11 @@ skip-if = (os == 'android' && android_version == '10') # Frequent orange crash. skip-if = (os == 'android') +[generated/test_conformance__textures__texture-size-limit.html] +# Crashes, timeouts, and Blues. +skip-if = (os == 'android') || (os == 'linux' && asan && e10s) +fail-if = (os == 'linux') + [generated/test_conformance__glsl__bugs__long-expressions-should-not-crash.html] # Crashes sometimes skip-if = (os == 'android') @@ -202,6 +258,9 @@ skip-if = (os == 'android') # Crashes on Android # Times-out on DEBUG builds skip-if = (os == 'android') || debug +[generated/test_conformance__textures__tex-image-webgl.html] +# Crashes +skip-if = (os == 'android') [generated/test_conformance__uniforms__out-of-bounds-uniform-array-access.html] # Crashes skip-if = (os == 'android') || (os == 'mac' && os_version == '10.6') @@ -300,6 +359,9 @@ skip-if = (os == 'android' && android_version == '10') ######################################################################## ######################################################################## # B2G +[generated/test_conformance__textures__tex-image-and-uniform-binding-bugs.html] +# Intermittently asserts on 'B2G ICS Emulator Debug'. +skip-if = (os == 'b2g') [generated/test_conformance__glsl__reserved___webgl_function.vert.html] fail-if = (os == 'b2g') [generated/test_conformance__glsl__reserved__webgl_function.vert.html] @@ -342,6 +404,9 @@ skip-if = (os == 'linux') [generated/test_conformance__ogles__GL__sign__sign_001_to_006.html] # Crashes skip-if = (os == 'linux') +[generated/test_conformance__textures__tex-image-and-sub-image-2d-with-image-data.html] +# Crashes +skip-if = (os == 'linux') ######################################################################## ######################################################################## @@ -393,6 +458,9 @@ fail-if = (os == 'mac' && os_version == '10.8') [generated/test_conformance__glsl__misc__large-loop-compile.html] fail-if = (os == 'win' && os_version == '5.1') +[generated/test_conformance__textures__copy-tex-image-2d-formats.html] +# Assert failure in DEBUG +skip-if = (os == 'win' && os_version == '5.1') [generated/test_conformance__uniforms__uniform-values-per-program.html] # Crashes on D3D11 debug. skip-if = (os == 'win' && os_version != '5.1')