Title: [192137] trunk/Tools
- Revision
- 192137
- Author
- dba...@webkit.org
- Date
- 2015-11-07 20:04:23 -0800 (Sat, 07 Nov 2015)
Log Message
Attempt to fix the Windows EWS bot after r192087
(https://bugs.webkit.org/show_bug.cgi?id=150859)
Following r192087 Port._build_path() stores the computed root directory path in option
_cached_root instead of overwriting option root. We need to teach the Windows-specific
logic to make use of option _cached_root instead of option root when computing its adjusted
path and to cache its adjusted in _cached_root instead of root.
* Scripts/webkitpy/port/win.py:
(WinPort._build_path):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (192136 => 192137)
--- trunk/Tools/ChangeLog 2015-11-08 03:33:46 UTC (rev 192136)
+++ trunk/Tools/ChangeLog 2015-11-08 04:04:23 UTC (rev 192137)
@@ -1,3 +1,16 @@
+2015-11-07 Daniel Bates <daba...@apple.com>
+
+ Attempt to fix the Windows EWS bot after r192087
+ (https://bugs.webkit.org/show_bug.cgi?id=150859)
+
+ Following r192087 Port._build_path() stores the computed root directory path in option
+ _cached_root instead of overwriting option root. We need to teach the Windows-specific
+ logic to make use of option _cached_root instead of option root when computing its adjusted
+ path and to cache its adjusted in _cached_root instead of root.
+
+ * Scripts/webkitpy/port/win.py:
+ (WinPort._build_path):
+
2015-11-06 Daniel Bates <daba...@apple.com>
Do not build LayoutTestRelay when --root is specified to run-webkit-tests
Modified: trunk/Tools/Scripts/webkitpy/port/win.py (192136 => 192137)
--- trunk/Tools/Scripts/webkitpy/port/win.py 2015-11-08 03:33:46 UTC (rev 192136)
+++ trunk/Tools/Scripts/webkitpy/port/win.py 2015-11-08 04:04:23 UTC (rev 192137)
@@ -125,14 +125,14 @@
def _build_path(self, *comps):
"""Returns the full path to the test driver (DumpRenderTree)."""
- root_directory = self.get_option('root')
+ root_directory = self.get_option('_cached_root') or self.get_option('root')
if not root_directory:
- ApplePort._build_path(self, *comps)
+ ApplePort._build_path(self, *comps) # Sets option _cached_root
binary_directory = 'bin32'
if self.get_option('architecture') == 'x86_64':
binary_directory = 'bin64'
- root_directory = self._filesystem.join(self.get_option('root'), binary_directory)
- self.set_option('root', root_directory)
+ root_directory = self._filesystem.join(self.get_option('_cached_root'), binary_directory)
+ self.set_option('_cached_root', root_directory)
return self._filesystem.join(self._filesystem.abspath(root_directory), *comps)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
