Title: [173926] trunk/Tools
Revision
173926
Author
[email protected]
Date
2014-09-24 12:24:57 -0700 (Wed, 24 Sep 2014)

Log Message

[Windows] Tentative fix for Windows test bots.
* Scripts/webkitpy/common/system/path.py:
(_CygPath.convert):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (173925 => 173926)


--- trunk/Tools/ChangeLog	2014-09-24 17:30:02 UTC (rev 173925)
+++ trunk/Tools/ChangeLog	2014-09-24 19:24:57 UTC (rev 173926)
@@ -1,3 +1,10 @@
+2014-09-24  Roger Fong  <[email protected]>
+
+        [Windows] Tentative fix for Windows test bots.
+
+        * Scripts/webkitpy/common/system/path.py:
+        (_CygPath.convert):
+
 2014-09-24  Alexey Proskuryakov  <[email protected]>
 
         Change more build.webkit.org links to https

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


--- trunk/Tools/Scripts/webkitpy/common/system/path.py	2014-09-24 17:30:02 UTC (rev 173925)
+++ trunk/Tools/Scripts/webkitpy/common/system/path.py	2014-09-24 19:24:57 UTC (rev 173926)
@@ -104,6 +104,10 @@
         self._child_process.stdin.write("%s\r\n" % path)
         self._child_process.stdin.flush()
         windows_path = self._child_process.stdout.readline().rstrip()
+        if windows_path == "":
+            _log.error("First attempt at Windows path was returned empty string")
+            self.close()
+            windows_path = self._child_process.stdout.readline().rstrip()
         _log.error("Windows path: %s" % windows_path)
         # Some versions of cygpath use lowercase drive letters while others
         # use uppercase. We always convert to uppercase for consistency.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to