[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[ukai at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit dd618b5d3b8430d29220eb816f6e82a770176baa
Author: ukai at chromium.org <ukai at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 18 02:19:37 2010 +0000

    2010-02-17  Fumitoshi Ukai  <ukai at chromium.org>
    
            Reviewed by Eric Seidel.
    
            websocket/tests/cookies/httponly-cookie.pl fails every time under run-chromium-webkit-tests
            https://bugs.webkit.org/show_bug.cgi?id=35001
    
            * Scripts/webkitpy/layout_tests/port/websocket_server.py: add -x flag to run pywebsocket.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54920 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index e718d8f..57e1b96 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2010-02-17  Fumitoshi Ukai  <ukai at chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        websocket/tests/cookies/httponly-cookie.pl fails every time under run-chromium-webkit-tests
+        https://bugs.webkit.org/show_bug.cgi?id=35001
+
+        * Scripts/webkitpy/layout_tests/port/websocket_server.py: add -x flag to run pywebsocket.
+
 2010-02-17  Shinichiro Hamaji  <hamaji at chromium.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/websocket_server.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/websocket_server.py
index ba8a5e9..54c2f6f 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/websocket_server.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/websocket_server.py
@@ -159,6 +159,7 @@ class PyWebSocket(http_server.Lighttpd):
             '-p', str(self._port),
             '-d', self._layout_tests,
             '-s', self._web_socket_tests,
+            '-x', '/websocket/tests/cookies',
             '-l', error_log,
         ]
 

-- 
WebKit Debian packaging