From a383fb91b67fbc4c655e41f310cf36175b0bc9da Mon Sep 17 00:00:00 2001 From: Benoit Jacob Date: Fri, 19 Aug 2011 11:39:00 -0400 Subject: [PATCH] Bug 679864 - [2/5] Upgrade WebGL conformance test suite to r15318 This patch updates the lists of failing tests, and adds some code to ignore a few intermittently failing tests: 1 on Linux and 4 on Mac --- .../canvas/test/webgl/failing_tests_linux.txt | 28 ++++++++++++++++++- .../canvas/test/webgl/failing_tests_mac.txt | 25 ++++++++++++++++- .../test/webgl/failing_tests_windows.txt | 19 ++++++++++++- .../test_webgl_conformance_test_suite.html | 16 +++++++++++ 4 files changed, 85 insertions(+), 3 deletions(-) diff --git a/content/canvas/test/webgl/failing_tests_linux.txt b/content/canvas/test/webgl/failing_tests_linux.txt index 8b137891791f..845e34f7a08f 100644 --- a/content/canvas/test/webgl/failing_tests_linux.txt +++ b/content/canvas/test/webgl/failing_tests_linux.txt @@ -1 +1,27 @@ - +conformance/buffer-offscreen-test.html +conformance/drawingbuffer-static-canvas-test.html +conformance/drawingbuffer-test.html +conformance/framebuffer-object-attachment.html +conformance/shaders/glsl-features/../../glsl-features.html?feature=abs-frag&reffs=shaders/glsl-features/abs-ref.frag&testfs=shaders/glsl-features/abs.frag +conformance/shaders/glsl-features/../../glsl-features.html?feature=abs-vert-vec2&refvs=shaders/glsl-features/abs-vec2-ref.vert&testvs=shaders/glsl-features/abs-vec2.vert +conformance/shaders/glsl-features/../../glsl-features.html?feature=abs-vert-vec3&refvs=shaders/glsl-features/abs-vec3-ref.vert&testvs=shaders/glsl-features/abs-vec3.vert +conformance/shaders/glsl-features/../../glsl-features.html?feature=abs-vert-vec4&refvs=shaders/glsl-features/abs-vec4-ref.vert&testvs=shaders/glsl-features/abs-vec4.vert +conformance/shaders/glsl-features/../../glsl-features.html?feature=sign-frag-vec4&reffs=shaders/glsl-features/sign-vec4-ref.frag&testfs=shaders/glsl-features/sign-vec4.frag +conformance/shaders/glsl-features/../../glsl-features.html?feature=sign-vert-vec4&refvs=shaders/glsl-features/sign-vec4-ref.vert&testvs=shaders/glsl-features/sign-vec4.vert +conformance/gl-get-active-attribute.html +conformance/gl-getshadersource.html +conformance/gl-uniform-bool.html +conformance/glsl-conformance.html +conformance/glsl-long-variable-names.html +conformance/invalid-passed-params.html +conformance/object-deletion-behaviour.html +conformance/premultiplyalpha-test.html +conformance/read-pixels-test.html +conformance/uninitialized-test.html +conformance/webgl-specific.html +conformance/more/conformance/quickCheckAPI.html +conformance/more/functions/copyTexImage2D.html +conformance/more/functions/copyTexSubImage2D.html +conformance/more/functions/deleteBufferBadArgs.html +conformance/more/functions/texImage2DBadArgs.html +conformance/more/functions/uniformfArrayLen1.html diff --git a/content/canvas/test/webgl/failing_tests_mac.txt b/content/canvas/test/webgl/failing_tests_mac.txt index 8b137891791f..1327522c21d5 100644 --- a/content/canvas/test/webgl/failing_tests_mac.txt +++ b/content/canvas/test/webgl/failing_tests_mac.txt @@ -1 +1,24 @@ - +conformance/buffer-offscreen-test.html +conformance/context-attributes-alpha-depth-stencil-antialias.html +conformance/drawingbuffer-static-canvas-test.html +conformance/drawingbuffer-test.html +conformance/framebuffer-object-attachment.html +conformance/gl-getshadersource.html +conformance/gl-object-get-calls.html +conformance/glsl-conformance.html +conformance/glsl-long-variable-names.html +conformance/invalid-passed-params.html +conformance/object-deletion-behaviour.html +conformance/premultiplyalpha-test.html +conformance/program-test.html +conformance/read-pixels-test.html +conformance/tex-input-validation.html +conformance/texture-npot.html +conformance/webgl-specific.html +conformance/more/conformance/quickCheckAPI.html +conformance/more/functions/copyTexImage2D.html +conformance/more/functions/copyTexSubImage2D.html +conformance/more/functions/deleteBufferBadArgs.html +conformance/more/functions/texImage2DBadArgs.html +conformance/more/functions/uniformfBadArgs.html +conformance/more/functions/uniformiBadArgs.html diff --git a/content/canvas/test/webgl/failing_tests_windows.txt b/content/canvas/test/webgl/failing_tests_windows.txt index 8b137891791f..dee4a35c1e14 100644 --- a/content/canvas/test/webgl/failing_tests_windows.txt +++ b/content/canvas/test/webgl/failing_tests_windows.txt @@ -1 +1,18 @@ - +conformance/buffer-offscreen-test.html +conformance/drawingbuffer-static-canvas-test.html +conformance/drawingbuffer-test.html +conformance/framebuffer-object-attachment.html +conformance/gl-getshadersource.html +conformance/glsl-conformance.html +conformance/glsl-long-variable-names.html +conformance/invalid-passed-params.html +conformance/object-deletion-behaviour.html +conformance/premultiplyalpha-test.html +conformance/read-pixels-test.html +conformance/webgl-specific.html +conformance/more/conformance/quickCheckAPI.html +conformance/more/functions/copyTexImage2D.html +conformance/more/functions/copyTexSubImage2D.html +conformance/more/functions/deleteBufferBadArgs.html +conformance/more/functions/texImage2DBadArgs.html +conformance/more/functions/uniformfArrayLen1.html diff --git a/content/canvas/test/webgl/test_webgl_conformance_test_suite.html b/content/canvas/test/webgl/test_webgl_conformance_test_suite.html index 6d483794b1bc..da1b373f3599 100644 --- a/content/canvas/test/webgl/test_webgl_conformance_test_suite.html +++ b/content/canvas/test/webgl/test_webgl_conformance_test_suite.html @@ -364,6 +364,22 @@ function start() { var testsToIgnore = []; + if (kIsMac) { + // intermittent failure on Mac OS 10.6, "images are different". Some compositing issue?? + testsToIgnore.push('conformance/shaders/glsl-features/../../glsl-features.html?feature=abs-frag&reffs=shaders/glsl-features/abs-ref.frag&testfs=shaders/glsl-features/abs.frag'); + testsToIgnore.push('conformance/shaders/glsl-features/../../glsl-features.html?feature=abs-vert-vec2&refvs=shaders/glsl-features/abs-vec2-ref.vert&testvs=shaders/glsl-features/abs-vec2.vert'); + testsToIgnore.push('conformance/shaders/glsl-features/../../glsl-features.html?feature=abs-vert-vec3&refvs=shaders/glsl-features/abs-vec3-ref.vert&testvs=shaders/glsl-features/abs-vec3.vert'); + testsToIgnore.push('conformance/shaders/glsl-features/../../glsl-features.html?feature=abs-vert-vec4&refvs=shaders/glsl-features/abs-vec4-ref.vert&testvs=shaders/glsl-features/abs-vec4.vert'); + } + + if (kIsLinux) { + // on talos-r3-fed64-019 I got this error message: + // Test failed, "gl.getExtension("OES_texture_float").myProperty should be 2 (of type number). + // Was undefined (of type undefined)." (URL: conformance/oes-texture-float.html) + // on other linux test slaves it worked. Does this test slave have different driver or hardware or what? + testsToIgnore.push('conformance/oes-texture-float.html'); + } + var testsSuccessful = []; runTestSuite();