[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[zmo at google.com]

The following commit has been merged in the debian/experimental branch:
commit 6deb62aa198b71cbc052a6f0899702f05437646a
Author: zmo at google.com <zmo at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 6 21:42:16 2011 +0000

    2011-01-06  Zhenyao Mo  <zmo at google.com>
    
            Unreviewed, add glsl-conformance.html to test_expectations.txt temporarily.
    
            * platform/chromium-gpu/test_expectations.txt:
            * platform/chromium/test_expectations.txt:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75194 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 42f7af0..3db39b7 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,10 @@
+2011-01-06  Zhenyao Mo  <zmo at google.com>
+
+        Unreviewed, add glsl-conformance.html to test_expectations.txt temporarily.
+
+        * platform/chromium-gpu/test_expectations.txt:
+        * platform/chromium/test_expectations.txt:
+
 2011-01-06  Robert Hogan  <robert at webkit.org>
 
         Reviewed by Antonio Gomes.
diff --git a/LayoutTests/platform/chromium-gpu/test_expectations.txt b/LayoutTests/platform/chromium-gpu/test_expectations.txt
index c67ad49..a1fade1 100644
--- a/LayoutTests/platform/chromium-gpu/test_expectations.txt
+++ b/LayoutTests/platform/chromium-gpu/test_expectations.txt
@@ -216,6 +216,8 @@ BUGCR60651 WIN : fast/canvas/webgl/glsl-conformance.html = TIMEOUT FAIL
 // BUGCR60651 : fast/canvas/webgl/uniform-location.html = TIMEOUT FAIL
 BUGWK47243 LINUX : fast/canvas/webgl/uniform-location.html = TIMEOUT TEXT
 BUGWK47243 WIN : fast/canvas/webgl/uniform-location.html = TIMEOUT CRASH
+// Failing after r75175
+BUGWEBGL : fast/canvas/webgl/glsl-conformance.html = CRASH
 BUG_AUTO WIN DEBUG : canvas/philip/tests/2d.text.draw.align.center.html = PASS TEXT
 BUGJAPHET WIN LINUX : fast/canvas/canvas-currentColor.html = TEXT
 
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index cb67ebe..a300f35 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -2581,6 +2581,9 @@ BUGWEBGL WIN DEBUG : fast/canvas/webgl/texture-complete.html = PASS TEXT
 BUGWEBGL : fast/canvas/webgl/gl-uniform-arrays.html = TEXT
 BUGWEBGL : fast/canvas/webgl/point-size.html = TEXT
 
+// Failing after r75175
+BUGWEBGL : fast/canvas/webgl/glsl-conformance.html = CRASH
+
 // These were not fixed by the Mesa 7.9 upgrade. Need to investigate.
 BUGCR60651 WIN : fast/canvas/webgl/gl-object-get-calls.html = TIMEOUT PASS
 BUGCR60651 WIN : fast/canvas/webgl/glsl-conformance.html = TIMEOUT FAIL

-- 
WebKit Debian packaging