Changeset 204376 in webkit

Timestamp:

Aug 11, 2016 10:42:27 AM (8 years ago)

Author:

pvollan@apple.com

Message:

[Win] Unable to reliably run tests in parallel
​https://bugs.webkit.org/show_bug.cgi?id=140914

Reviewed by Brent Fulgham.

The cygpath utility function can fail badly when running with multiple DumpRenderTree
processes. We can use string replacement to convert the Cygwin path to a Windows path
instead.

• Scripts/webkitpy/common/system/path.py:

(cygpathFast):

• Scripts/webkitpy/port/driver.py:

(Driver._command_from_driver_input):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/system/path.py (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2016-08-11  Per Arne Vollan  <pvollan@apple.com>
+
+        [Win] Unable to reliably run tests in parallel
+        https://bugs.webkit.org/show_bug.cgi?id=140914
+
+        Reviewed by Brent Fulgham.
+
+        The cygpath utility function can fail badly when running with multiple DumpRenderTree
+        processes. We can use string replacement to convert the Cygwin path to a Windows path
+        instead.
+
+        * Scripts/webkitpy/common/system/path.py:
+        (cygpathFast):
+        * Scripts/webkitpy/port/driver.py:
+        (Driver._command_from_driver_input):
+
 2016-08-10  Alex Christensen  <achristensen@webkit.org>
 

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

@@ -31 +31 @@
 import atexit
 import os
+import re
 import subprocess
 import sys
@@ -79 +80 @@
                 atexit.register(_CygPath.stop_cygpath_subprocess)
 
-            return _CygPath._singleton.convert(path)
+            return _CygPath._singleton.convertFast(path)
 
     def __init__(self):
         self._child_process = None
+        self._rootDict = {}
 
     def start(self):
@@ -119 +121 @@
         return windows_path
 
+    def convertFast(self, path):
+        # Use a dictionary to store previously converted file system roots.
+        match = re.match('(^/cygdrive/./)(.+)', path)
+        if not match:
+            match = re.match('(^/)(.+)', path)
+        if match:
+            try:
+                root = self._rootDict[match.group(1)]
+            except:
+                self._rootDict[match.group(1)] = self.convert(match.group(1))
+                root = self._rootDict[match.group(1)]
+            if not root.endswith('\\'):
+                root += '\\'
+            path = root + match.group(2)
+            path = re.sub('/', r'\\', path)
+            return path
+        else:
+            self.convert(path)
 
 def _escape(path):