Changeset 57831 in webkit

Timestamp:

Apr 19, 2010 1:17:28 PM (14 years ago)

Author:

dpranke@chromium.org

Message:

2010-04-19 Dirk Pranke <​dpranke@chromium.org>

Unreviewed, build fix.

Fix breakage of chromium-win canary bots caused by r57806. That patch
introduced the option of using Chrome's new port of DumpRenderTree,
but unfortunately that port relies on the webkit.py class
implementation which uses non-blocking I/O that isn't available on
Windows. This patch turns off that option and doesn't import the
class if we're running on Windows.

​https://bugs.webkit.org/show_bug.cgi?id=37817

• Scripts/webkitpy/layout_tests/port/chromium.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/chromium.py (modified) (2 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-04-19  Dirk Pranke  <dpranke@chromium.org>
+
+        Unreviewed, build fix.
+
+        Fix breakage of chromium-win canary bots caused by r57806. That patch
+        introduced the option of using Chrome's new port of DumpRenderTree,
+        but unfortunately that port relies on the webkit.py class
+        implementation which uses non-blocking I/O that isn't available on
+        Windows. This patch turns off that option and doesn't import the
+        class if we're running on Windows.
+
+        https://bugs.webkit.org/show_bug.cgi?id=37817
+
+        * Scripts/webkitpy/layout_tests/port/chromium.py:
+
 2010-04-19  James Robinson  <jamesr@chromium.org>
 

trunk/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py

@@ -41 +41 @@
 import base
 import http_server
-import webkit
+
+# FIXME: To use the DRT-based version of this file, we need to be able to
+# run the webkit code, which uses server_process, which requires UNIX-style
+# non-blocking I/O with selects(), which requires fcntl() which doesn't exist
+# on Windows.
+if sys.platform not in ('win32', 'cygwin'):
+    import webkit
+
 import websocket_server
 
@@ -74 +81 @@
         base.Port.__init__(self, port_name, options)
         self._chromium_base_dir = None
+
+        # FIXME: see comment above re: import webkit
+        if sys.platform in ('win32', 'cygwin') and options:
+            options.use_drt = False
 
     def baseline_path(self):