Title: [204167] trunk/Tools
Revision
204167
Author
commit-qu...@webkit.org
Date
2016-08-05 06:43:49 -0700 (Fri, 05 Aug 2016)

Log Message

Unreviewed, rolling out r204123.
https://bugs.webkit.org/show_bug.cgi?id=160597

Caused layout test timeouts on Windows. (Requested by perarne
on #webkit).

Reverted changeset:

"[Win] Unable to reliably run tests in parallel"
https://bugs.webkit.org/show_bug.cgi?id=140914
http://trac.webkit.org/changeset/204123

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (204166 => 204167)


--- trunk/Tools/ChangeLog	2016-08-05 11:25:28 UTC (rev 204166)
+++ trunk/Tools/ChangeLog	2016-08-05 13:43:49 UTC (rev 204167)
@@ -1,3 +1,17 @@
+2016-08-05  Commit Queue  <commit-qu...@webkit.org>
+
+        Unreviewed, rolling out r204123.
+        https://bugs.webkit.org/show_bug.cgi?id=160597
+
+        Caused layout test timeouts on Windows. (Requested by perarne
+        on #webkit).
+
+        Reverted changeset:
+
+        "[Win] Unable to reliably run tests in parallel"
+        https://bugs.webkit.org/show_bug.cgi?id=140914
+        http://trac.webkit.org/changeset/204123
+
 2016-08-04  Saam Barati  <sbar...@apple.com>
 
         Restore CodeBlock jettison code to jettison when a CodeBlock has been alive for a long time

Modified: trunk/Tools/Scripts/webkitpy/common/system/path.py (204166 => 204167)


--- trunk/Tools/Scripts/webkitpy/common/system/path.py	2016-08-05 11:25:28 UTC (rev 204166)
+++ trunk/Tools/Scripts/webkitpy/common/system/path.py	2016-08-05 13:43:49 UTC (rev 204167)
@@ -30,7 +30,6 @@
 
 import atexit
 import os
-import re
 import subprocess
 import sys
 import logging
@@ -52,13 +51,6 @@
     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
 # from multiple threads under protection of a lock (as is done in cygpath())
 class _CygPath(object):

Modified: trunk/Tools/Scripts/webkitpy/port/driver.py (204166 => 204167)


--- trunk/Tools/Scripts/webkitpy/port/driver.py	2016-08-05 11:25:28 UTC (rev 204166)
+++ trunk/Tools/Scripts/webkitpy/port/driver.py	2016-08-05 13:43:49 UTC (rev 204167)
@@ -456,7 +456,7 @@
         else:
             command = self._port.abspath_for_test(driver_input.test_name)
             if sys.platform == 'cygwin':
-                command = path.cygpathFast(command)
+                command = path.cygpath(command)
 
         assert not driver_input.image_hash or driver_input.should_run_pixel_test
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to