[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

mihaip at chromium.org mihaip at chromium.org
Wed Dec 22 13:42:27 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 5068ca4e65ff2fc9e9b7010dbff8a18ae4160d5c
Author: mihaip at chromium.org <mihaip at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 23 20:24:48 2010 +0000

    2010-09-23  Mihai Parparita  <mihaip at chromium.org>
    
            Reviewed by David Levin.
    
            [Chromium] remove incorrect baselines for two WebGL tests
            https://bugs.webkit.org/show_bug.cgi?id=46372
    
            As far as I can tell, these tests were not failing because of
            "new-run-webkit-tests's diff trimming line ends", but because they had
            chromium-mac baselines checked in with r56251, but then the test was
            changed since then, with the chromium-mac baselines not being updated.
            The test seems to pass on chromium-mac (both test_shell and DRT) with
            the regular baselines.
    
            * platform/chromium-mac/fast/canvas/webgl/null-object-behaviour-expected.txt: Removed.
            * platform/chromium-mac/fast/canvas/webgl/uniform-location-expected.txt: Removed.
            * platform/chromium/test_expectations.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68187 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index f2cd9e6..1a75da8 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,21 @@
+2010-09-23  Mihai Parparita  <mihaip at chromium.org>
+
+        Reviewed by David Levin.
+
+        [Chromium] remove incorrect baselines for two WebGL tests
+        https://bugs.webkit.org/show_bug.cgi?id=46372
+        
+        As far as I can tell, these tests were not failing because of
+        "new-run-webkit-tests's diff trimming line ends", but because they had
+        chromium-mac baselines checked in with r56251, but then the test was
+        changed since then, with the chromium-mac baselines not being updated.
+        The test seems to pass on chromium-mac (both test_shell and DRT) with
+        the regular baselines.        
+
+        * platform/chromium-mac/fast/canvas/webgl/null-object-behaviour-expected.txt: Removed.
+        * platform/chromium-mac/fast/canvas/webgl/uniform-location-expected.txt: Removed.
+        * platform/chromium/test_expectations.txt:
+
 2010-09-23  Eric Carlson  <eric.carlson at apple.com>
 
         Reviewed by Simon Fraser
diff --git a/LayoutTests/platform/chromium-mac/fast/canvas/webgl/null-object-behaviour-expected.txt b/LayoutTests/platform/chromium-mac/fast/canvas/webgl/null-object-behaviour-expected.txt
deleted file mode 100644
index 4d13edb..0000000
--- a/LayoutTests/platform/chromium-mac/fast/canvas/webgl/null-object-behaviour-expected.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-Tests calling WebGL APIs without providing the necessary objects
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-PASS context.compileShader() threw exception GL error 1282 in compileShader.
-PASS context.linkProgram() threw exception GL error 1282 in linkProgram.
-PASS context.attachShader() threw exception GL error 1281 in attachShader.
-PASS context.attachShader(program, undefined) threw exception GL error 1281 in attachShader.
-PASS context.attachShader(undefined, shader) threw exception GL error 1281 in attachShader.
-PASS context.detachShader(program, undefined) threw exception GL error 1282 in detachShader.
-PASS context.detachShader(undefined, shader) threw exception GL error 1282 in detachShader.
-PASS context.shaderSource() threw exception GL error 1282 in shaderSource.
-PASS context.shaderSource(undefined, 'foo') threw exception GL error 1282 in shaderSource.
-PASS context.bindAttribLocation(undefined, 0, 'foo') threw exception GL error 1282 in bindAttribLocation.
-PASS context.bindBuffer(context.ARRAY_BUFFER, 0) is undefined.
-PASS context.bindFramebuffer(context.FRAMEBUFFER, 0) is undefined.
-PASS context.bindRenderbuffer(context.RENDERBUFFER, 0) is undefined.
-PASS context.bindTexture(context.TEXTURE_2D, 0) is undefined.
-PASS context.framebufferRenderbuffer(context.FRAMEBUFFER, context.DEPTH_ATTACHMENT, context.RENDERBUFFER, 0) threw exception GL error 1282 in framebufferRenderbuffer.
-PASS context.framebufferTexture2D(context.FRAMEBUFFER, context.COLOR_ATTACHMENT0, context.TEXTURE_2D, 0, 0) threw exception GL error 1282 in framebufferTexture2D.
-PASS context.getProgramParameter(undefined, 0) threw exception GL error 1282 in getProgramParameter.
-PASS context.getProgramInfoLog(undefined, 0) threw exception GL error 1282 in getProgramInfoLog.
-PASS context.getShaderParameter(undefined, 0) threw exception GL error 1282 in getShaderParameter.
-PASS context.getShaderInfoLog(undefined, 0) threw exception GL error 1282 in getShaderInfoLog.
-PASS context.getShaderSource(undefined) threw exception GL error 1282 in getShaderSource.
-PASS context.getUniform(undefined, 0) threw exception Error: SYNTAX_ERR: DOM Exception 12.
-PASS context.getUniformLocation(undefined, 'foo') threw exception GL error 1282 in getUniformLocation.
-PASS successfullyParsed is true
-
-TEST COMPLETE
diff --git a/LayoutTests/platform/chromium-mac/fast/canvas/webgl/uniform-location-expected.txt b/LayoutTests/platform/chromium-mac/fast/canvas/webgl/uniform-location-expected.txt
deleted file mode 100644
index e108c2e..0000000
--- a/LayoutTests/platform/chromium-mac/fast/canvas/webgl/uniform-location-expected.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-Tests WebGL APIs related to shader uniforms
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-PASS contextA.useProgram(programA2) is undefined.
-PASS contextA.uniformMatrix4fv(locationA, false, mat) threw exception GL error 1282 in uniformMatrix4fv.
-PASS contextA.useProgram(programA1) is undefined.
-PASS contextA.uniformMatrix4fv(locationA, false, mat) is undefined.
-PASS contextA.uniformMatrix4fv(0, false, mat) threw exception Error: SYNTAX_ERR: DOM Exception 12.
-PASS contextA.useProgram(programS) is undefined.
-PASS contextA.uniform1i(locationSx, 3) is undefined.
-PASS contextA.uniform1f(locationArray0, 4.0) is undefined.
-PASS contextA.getUniform(programS, locationSx) is 3
-PASS contextA.getUniform(programS, locationArray0) is 4.0
-PASS contextA.useProgram(programV) is undefined.
-PASS contextA.uniform4fv(locationVec4, vec) is undefined.
-PASS contextA.getUniform(programV, locationVec4) is vec
-PASS contextA.getUniformLocation(programV, "IDontExist") is null
-PASS successfullyParsed is true
-
-TEST COMPLETE
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index d724d37..86996f0 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -3079,10 +3079,6 @@ BUGDPRANKE WIN LINUX : media/video-poster.html = PASS TEXT
 
 BUGWK45898 : editing/selection/context-menu-on-text.html = TEXT
 
-// These are failing due to new-run-webkit-tests's diff trimming line ends.
-BUGWEBGL MAC : fast/canvas/webgl/null-object-behaviour.html = TEXT
-BUGWEBGL MAC : fast/canvas/webgl/uniform-location.html = TEXT
-
 BUGWEBGL WIN LINUX : fast/canvas/webgl/context-attributes-alpha-depth-stencil-antialias.html = TEXT
 BUGWEBGL : fast/canvas/webgl/css-webkit-canvas-repaint.html = IMAGE
 BUGWEBGL : fast/canvas/webgl/css-webkit-canvas.html = IMAGE

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list