Title: [190511] trunk/Tools
- Revision
- 190511
- Author
- [email protected]
- Date
- 2015-10-02 10:58:21 -0700 (Fri, 02 Oct 2015)
Log Message
[Win] Unreviewed test fix.
You cannot run 'run-webkit-tests' from the command line because it does not know
to append the binary subdirectory (bin32/bin64). We don't see this on our builders
because they explicitly set use the 'root' argument to provide the full path to
the test binaries.
* Scripts/webkitpy/port/win.py:
(WinPort._build_path): Added.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (190510 => 190511)
--- trunk/Tools/ChangeLog 2015-10-02 17:46:25 UTC (rev 190510)
+++ trunk/Tools/ChangeLog 2015-10-02 17:58:21 UTC (rev 190511)
@@ -1,3 +1,15 @@
+2015-10-02 Brent Fulgham <[email protected]>
+
+ [Win] Unreviewed test fix.
+
+ You cannot run 'run-webkit-tests' from the command line because it does not know
+ to append the binary subdirectory (bin32/bin64). We don't see this on our builders
+ because they explicitly set use the 'root' argument to provide the full path to
+ the test binaries.
+
+ * Scripts/webkitpy/port/win.py:
+ (WinPort._build_path): Added.
+
2015-10-02 Alex Christensen <[email protected]>
Reloading without content blockers doesn't apply to resource loads after the main frame finishes
Modified: trunk/Tools/Scripts/webkitpy/port/win.py (190510 => 190511)
--- trunk/Tools/Scripts/webkitpy/port/win.py 2015-10-02 17:46:25 UTC (rev 190510)
+++ trunk/Tools/Scripts/webkitpy/port/win.py 2015-10-02 17:58:21 UTC (rev 190511)
@@ -118,6 +118,16 @@
return None
return match_object.group('features_string').split(' ')
+ def _build_path(self, *comps):
+ """Returns the full path to the test driver (DumpRenderTree)."""
+ root_directory = self.get_option('root')
+ if not root_directory:
+ ApplePort._build_path(self, *comps)
+ root_directory = self._filesystem.join(self.get_option('root'), "bin32")
+ self.set_option('root', root_directory)
+
+ return self._filesystem.join(self._filesystem.abspath(root_directory), *comps)
+
# Note: These are based on the stock XAMPP locations for these files.
def _uses_apache(self):
return True
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
