Changeset 69638 in webkit

Timestamp:

Oct 12, 2010 9:39:56 PM (14 years ago)

Author:

dpranke@chromium.org

Message:

2010-10-12 Dirk Pranke <​dpranke@chromium.org>

Reviewed by Eric Seidel.

This patch enables new-run-webkit-tests (in particular the
chromium-win port) to run under Cygwin as well as Win32. Mostly
this just required some conversions from cygwin paths to Win32
paths when we spawn off Win32 binaries like test_shell.

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

• Scripts/webkitpy/common/system/path.py:
• Expose the cygpath() function for path conversion

• Scripts/webkitpy/layout_tests/run_webkit_tests.py:
• Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py:
• shift filename->uri conversion in the TestInfo objects to the dump_render_tree thread

• Scripts/webkitpy/layout_tests/port/base.py:
• Scripts/webkitpy/layout_tests/port/chromium.py:
• use cygpath()

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/system/path.py (modified) (3 diffs)
• Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py (modified) (8 diffs)
• Scripts/webkitpy/layout_tests/port/base.py (modified) (3 diffs)
• Scripts/webkitpy/layout_tests/port/base_unittest.py (modified) (2 diffs)
• Scripts/webkitpy/layout_tests/port/chromium.py (modified) (4 diffs)
• Scripts/webkitpy/layout_tests/run_webkit_tests.py (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-10-12  Dirk Pranke  <dpranke@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        This patch enables new-run-webkit-tests (in particular the
+        chromium-win port) to run under Cygwin as well as Win32. Mostly
+        this just required some conversions from cygwin paths to Win32
+        paths when we spawn off Win32 binaries like test_shell.
+
+        https://bugs.webkit.org/show_bug.cgi?id=47220
+
+        * Scripts/webkitpy/common/system/path.py:
+        - Expose the cygpath() function for path conversion
+
+        * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+        * Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py:
+        - shift filename->uri conversion in the TestInfo objects to the
+          dump_render_tree thread
+
+        * Scripts/webkitpy/layout_tests/port/base.py:
+        * Scripts/webkitpy/layout_tests/port/chromium.py:
+        - use cygpath()
+
 2010-10-12  Yuta Kitamura  <yutak@chromium.org>
 

trunk/WebKitTools/Scripts/webkitpy/common/system/path.py

@@ -39 +39 @@
 
 
+def cygpath(path, executive):
+    """Converts a cygwin path to Windows path."""
+    # FIXME: this may not be correct in every situation, but forking
+    # cygpath is very slow. More importantly, there is a bug in Python
+    # where launching subprocesses and communicating with PIPEs (which
+    # is what run_command() does) can lead to deadlocks when running in
+    # multiple threads.
+    if path.startswith("/cygdrive"):
+        path = path[10] + ":" + path[11:]
+        path = path.replace("/", "\\")
+        return path
+    return executive.run_command(['cygpath', '-wa', path],
+                                 decode_output=False).rstrip()
+
+
 def _escape(path):
     """Handle any characters in the path that should be escaped."""
@@ -53 +68 @@
         return _winpath_to_uri(path)
     if platform == 'cygwin':
-        return _winpath_to_uri(_cygpath(path, executive))
+        return _winpath_to_uri(cygpath(path, executive))
     return _unixypath_to_uri(path)
 
@@ -61 +76 @@
     return "///" + path.replace("\\", "/")
 
-
-def _cygpath(path, executive):
-    """Converts a cygwin path to Windows path."""
-    return executive.run_command(['cygpath', '-wa', path],
-                                 decode_output=False).rstrip()
-
-
 def _unixypath_to_uri(path):
     """Converts a unix-style path to a file: URL."""

trunk/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py

@@ -84 +84 @@
       options: command line options argument from optparse
       proc: an active DumpRenderTree process
-      test_info: Object containing the test filename, uri and timeout
+      test_info: Object containing the test filename and timeout
       test_types: list of test types to subject the output to
       test_args: arguments to be passed to each test
@@ -173 +173 @@
           port: object implementing port-specific hooks
           options: command line argument object from optparse
-          test_info: Object containing the test filename, uri and timeout
+          test_info: Object containing the test filename and timeout
           test_types: A list of TestType objects to run the test output
               against.
@@ -194 +194 @@
         # in coverage: see http://bitbucket.org/ned/coveragepy/issue/85.
         test_info = self._test_info
+        uri = self._port.filename_to_uri(test_info.filename)
         self._driver = self._port.create_driver(self._test_args.png_path,
                                                 self._options)
@@ -199 +200 @@
         start = time.time()
         crash, timeout, actual_checksum, output, error = \
-            self._driver.run_test(test_info.uri.strip(), test_info.timeout,
+            self._driver.run_test(uri, test_info.timeout,
                                   test_info.image_hash())
         end = time.time()
@@ -256 +257 @@
           options: command line options argument from optparse
           filename_list_queue: A thread safe Queue class that contains lists
-              of tuples of (filename, uri) pairs.
+              of (filename, TestInfo) pairs.
           result_queue: A thread safe Queue class that will contain tuples of
               (test, failure lists) for the test results.
@@ -460 +461 @@
 
         Args:
-          test_info: Object containing the test filename, uri and timeout
+          test_info: Object containing the test filename and timeout
 
         Returns:
@@ -508 +509 @@
 
         Args:
-          test_info: Object containing the test filename, uri and timeout
+          test_info: Object containing the test filename and timeout
 
         Returns:
@@ -530 +531 @@
         self._next_timeout = start + thread_timeout
 
+        uri = self._port.filename_to_uri(test_info.filename)
         crash, timeout, actual_checksum, output, error = \
-           self._driver.run_test(test_info.uri, test_info.timeout, image_hash)
+           self._driver.run_test(uri, test_info.timeout, image_hash)
         end = time.time()
 

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

@@ -50 +50 @@
 from webkitpy.common.system import logutils
 from webkitpy.common.system.executive import Executive, ScriptError
+from webkitpy.common.system.path import abspath_to_uri
 from webkitpy.common.system.user import User
 
@@ -313 +314 @@
             return "%s://127.0.0.1:%u/%s" % (protocol, port, relative_path)
 
-        abspath = os.path.abspath(filename)
-
-        # On Windows, absolute paths are of the form "c:\foo.txt". However,
-        # all current browsers (except for Opera) normalize file URLs by
-        # prepending an additional "/" as if the absolute path was
-        # "/c:/foo.txt". This means that all file URLs end up with "file:///"
-        # at the beginning.
-        if sys.platform == 'win32':
-            abspath = '/' + abspath.replace('\\', '/')
-
-        return "file://" + abspath
+        return abspath_to_uri(os.path.abspath(filename), self._executive)
 
     def tests(self, paths):
@@ -372 +363 @@
         test = uri
         if uri.startswith("file:///"):
+            # FIXME: need an inverse of uri_to_abspath()
             if sys.platform == 'win32':
                 test = test.replace('file:///', '')
                 test = test.replace('/', '\\')
+            elif sys.platform == 'cygwin':
+                test = '/cygdrive/' + uri[8] + '/' + uri[11:]
             else:
                 test = test.replace('file://', '')

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

@@ -35 +35 @@
 
 from webkitpy.common.system.executive import Executive, ScriptError
+from webkitpy.common.system.path import abspath_to_uri
 from webkitpy.thirdparty.mock import Mock
 
@@ -228 +229 @@
 
     def test_filename_to_uri(self):
-
         port = base.Port()
         layout_test_dir = port.layout_tests_dir()
         test_file = os.path.join(layout_test_dir, "foo", "bar.html")
-
-        # On Windows, absolute paths are of the form "c:\foo.txt". However,
-        # all current browsers (except for Opera) normalize file URLs by
-        # prepending an additional "/" as if the absolute path was
-        # "/c:/foo.txt". This means that all file URLs end up with "file:///"
-        # at the beginning.
-        if sys.platform == 'win32':
-            prefix = "file:///"
-            path = test_file.replace("\\", "/")
-        else:
-            prefix = "file://"
-            path = test_file
-
         self.assertEqual(port.filename_to_uri(test_file),
-                         prefix + path)
+                         abspath_to_uri(test_file, Executive()))
 
 

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

@@ -44 +44 @@
 import webbrowser
 
+from webkitpy.common.system.executive import Executive
+from webkitpy.common.system.path import abspath_to_uri, cygpath
+from webkitpy.layout_tests.layout_package import test_expectations
+
 import base
 import http_server
-
-from webkitpy.common.system.executive import Executive
-from webkitpy.layout_tests.layout_package import test_expectations
 
 # Chromium DRT on OSX uses WebKitDriver.
@@ -144 +145 @@
             file.write(actual_contents)
 
+        # We use convert_path if there's a chance that the launched
+        # executable needs filename arguments in a different format than
+        # the normal format provided by the python runtime. The main
+        # example of this is running under Cygwin on Windows but
+        # launching a Win32 binary, where we need to convert the path
+        # from /cygdrive/c/foo.txt to c:\foo.txt.
         if diff_filename:
-            cmd = [executable, '--diff', expected_filename,
-                   actual_filename, diff_filename]
+            cmd = [executable, '--diff',
+                   self._convert_path(expected_filename),
+                   self._convert_path(actual_filename),
+                   self._convert_path(diff_filename)]
         else:
-            cmd = [executable, expected_filename, actual_filename]
+            cmd = [executable,
+                   self._convert_path(expected_filename),
+                   self._convert_path(actual_filename)]
 
         result = True
@@ -341 +352 @@
         return self.path_from_webkit_base('LayoutTests', 'platform', platform)
 
+    def _convert_path(self, path):
+        """Handles filename conversion for subprocess command line args."""
+        # See note above in diff_image() for why we need this.
+        if sys.platform == 'cygwin':
+            return cygpath(path, self._executive)
+        return path
+
     def _path_to_image_diff(self):
         binary_name = 'image_diff'
@@ -360 +378 @@
         driver_args = []
         if self._image_path:
-            driver_args.append("--pixel-tests=" + self._image_path)
+            # See note above in diff_image() for why we need
+            # _convert_path().
+            driver_args.append("--pixel-tests=" +
+                               self._port._convert_path(self._image_path))
 
         if self._options.use_drt:

trunk/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py

@@ -92 +92 @@
 
     def __init__(self, port, filename, timeout):
-        """Generates the URI and stores the filename and timeout for this test.
+        """
         Args:
           filename: Full path to the test.
-          timeout: Timeout for running the test in TestShell.
+          timeout: Timeout for running the test in DRT.
           """
         self.filename = filename
         self._port = port
-        self.uri = port.filename_to_uri(filename)
         self.timeout = timeout
         self._image_checksum = -1