Changeset 204123 in webkit

Timestamp:

Aug 4, 2016, 10:02:42 AM (9 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) (2 diffs)
• Scripts/webkitpy/port/driver.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2016-08-04  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-03  Aakash Jain  <aakash_jain@apple.com>
 

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

@@ -31 +31 @@
 import atexit
 import os
+import re
 import subprocess
 import sys
@@ -51 +52 @@
     return path
 
+
+def cygpathFast(path):
+    """Converts an absolute cygwin path to an absolute Windows path with string replacement."""
+    if sys.platform == 'cygwin':
+        path = re.sub('/cygdrive/c', 'c:', path)
+        path = re.sub('/', r'\\', path)
+    return path
 
 # Note that this object is not threadsafe and must only be called

trunk/Tools/Scripts/webkitpy/port/driver.py

@@ -457 +457 @@
             command = self._port.abspath_for_test(driver_input.test_name)
             if sys.platform == 'cygwin':
-                command = path.cygpath(command)
+                command = path.cygpathFast(command)
 
         assert not driver_input.image_hash or driver_input.should_run_pixel_test