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

[tony at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 64ed27bfb9310d3e8ccf61d24af1994ada0cedae
Author: tony at chromium.org <tony at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Aug 2 16:26:03 2010 +0000

    2010-08-02  Tony Chang  <tony at chromium.org>
    
            Reviewed by Kent Tamura.
    
            [chromium] use ChromiumDriver on Linux when running webkit tests
            https://bugs.webkit.org/show_bug.cgi?id=43273
    
            * Scripts/webkitpy/layout_tests/port/chromium.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64466 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index dd9c6ed..dbbf9e3 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-02  Tony Chang  <tony at chromium.org>
+
+        Reviewed by Kent Tamura.
+
+        [chromium] use ChromiumDriver on Linux when running webkit tests
+        https://bugs.webkit.org/show_bug.cgi?id=43273
+
+        * Scripts/webkitpy/layout_tests/port/chromium.py:
+
 2010-08-02  Kent Tamura  <tkent at chromium.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py
index f8b181c..6cfc0b8 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py
@@ -47,8 +47,8 @@ import http_server
 
 from webkitpy.common.system.executive import Executive
 
-# Chromium DRT on non-Windows uses WebKitDriver.
-if sys.platform not in ('win32', 'cygwin'):
+# Chromium DRT on OSX uses WebKitDriver.
+if sys.platform == 'darwin':
     import webkit
 
 import websocket_server
@@ -172,7 +172,7 @@ class ChromiumPort(base.Port):
 
     def create_driver(self, image_path, options):
         """Starts a new Driver and returns a handle to it."""
-        if self._options.use_drt and sys.platform not in ('win32', 'cygwin'):
+        if self._options.use_drt and sys.platform == 'darwin':
             return webkit.WebKitDriver(self, image_path, options, executive=self._executive)
         if self._options.use_drt:
             options += ['--test-shell']

-- 
WebKit Debian packaging