[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[ukai at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit 65427eb2b25db3fae595e58bb4a7c703ccfae7ba
Author: ukai at chromium.org <ukai at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 19 10:41:18 2009 +0000

    2009-11-19  Fumitoshi Ukai  <ukai at chromium.org>
    
            Reviewed by Eric Seidel.
    
            Ignore websocket tests when --no-http is specified.
            https://bugs.webkit.org/show_bug.cgi?id=31662
    
            * Scripts/run-webkit-tests:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51180 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 6eed539..4677a62 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2009-11-19  Fumitoshi Ukai  <ukai at chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Ignore websocket tests when --no-http is specified.
+        https://bugs.webkit.org/show_bug.cgi?id=31662
+
+        * Scripts/run-webkit-tests:
+
 2009-11-18  Adam Barth  <abarth at webkit.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebKitTools/Scripts/run-webkit-tests b/WebKitTools/Scripts/run-webkit-tests
index b430cf7..1e37286 100755
--- a/WebKitTools/Scripts/run-webkit-tests
+++ b/WebKitTools/Scripts/run-webkit-tests
@@ -417,6 +417,7 @@ if (checkWebCoreSVGSupport(0)) {
 
 if (!$testHTTP) {
     $ignoredDirectories{'http'} = 1;
+    $ignoredDirectories{'websocket'} = 1;
 }
 
 if (!$testMedia) {

-- 
WebKit Debian packaging