Title: [192127] trunk/Tools
- Revision
- 192127
- Author
- dba...@webkit.org
- Date
- 2015-11-06 21:14:30 -0800 (Fri, 06 Nov 2015)
Log Message
Do not build LayoutTestRelay when --root is specified to run-webkit-tests
https://bugs.webkit.org/show_bug.cgi?id=150989
Reviewed by Alexey Proskuryakov.
The script run-webkit-tests should only check if LayoutTestRelay exists when invoked with
--root and exit with an error if it does not exist. That is, we should not build LayoutTestRelay
when it does not exist and an explicit directory of built executables was specified via --root.
This will make the criterion for building LayoutTestRelay match the criterion for building
DumpRenderTree/WebKitTestRunner.
* Scripts/webkitpy/port/ios.py:
(IOSSimulatorPort._check_port_build): Moved logic from IOSSimulatorPort.{_check_build_relay, check_build} to here.
(IOSSimulatorPort._check_build_relay): Deleted.
(IOSSimulatorPort.check_build): Deleted.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (192126 => 192127)
--- trunk/Tools/ChangeLog 2015-11-07 04:44:02 UTC (rev 192126)
+++ trunk/Tools/ChangeLog 2015-11-07 05:14:30 UTC (rev 192127)
@@ -1,3 +1,21 @@
+2015-11-06 Daniel Bates <daba...@apple.com>
+
+ Do not build LayoutTestRelay when --root is specified to run-webkit-tests
+ https://bugs.webkit.org/show_bug.cgi?id=150989
+
+ Reviewed by Alexey Proskuryakov.
+
+ The script run-webkit-tests should only check if LayoutTestRelay exists when invoked with
+ --root and exit with an error if it does not exist. That is, we should not build LayoutTestRelay
+ when it does not exist and an explicit directory of built executables was specified via --root.
+ This will make the criterion for building LayoutTestRelay match the criterion for building
+ DumpRenderTree/WebKitTestRunner.
+
+ * Scripts/webkitpy/port/ios.py:
+ (IOSSimulatorPort._check_port_build): Moved logic from IOSSimulatorPort.{_check_build_relay, check_build} to here.
+ (IOSSimulatorPort._check_build_relay): Deleted.
+ (IOSSimulatorPort.check_build): Deleted.
+
2015-11-06 Tim Horton <timothy_hor...@apple.com>
Add preliminary (SPI) support for NSTextFinder on WKWebView
Modified: trunk/Tools/Scripts/webkitpy/port/ios.py (192126 => 192127)
--- trunk/Tools/Scripts/webkitpy/port/ios.py 2015-11-07 04:44:02 UTC (rev 192126)
+++ trunk/Tools/Scripts/webkitpy/port/ios.py 2015-11-07 05:14:30 UTC (rev 192127)
@@ -144,17 +144,13 @@
return False
return True
- def _check_build_relay(self):
- if self.get_option('build') and not self._build_relay():
+ def _check_port_build(self):
+ if not self._root_was_set and self.get_option('build') and not self._build_relay():
return False
if not self._check_relay():
return False
return True
- def check_build(self, needs_http):
- needs_driver = super(IOSSimulatorPort, self).check_build(needs_http)
- return needs_driver and self._check_build_relay()
-
def _build_relay(self):
environment = self.host.copy_current_environment()
environment.disable_gcc_smartquotes()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
