<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[192127] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/192127">192127</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2015-11-06 21:14:30 -0800 (Fri, 06 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpyportiospy">trunk/Tools/Scripts/webkitpy/port/ios.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (192126 => 192127)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-11-07 04:44:02 UTC (rev 192126)
+++ trunk/Tools/ChangeLog 2015-11-07 05:14:30 UTC (rev 192127)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-11-06 Daniel Bates <dabates@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.
+
</ins><span class="cx"> 2015-11-06 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Add preliminary (SPI) support for NSTextFinder on WKWebView
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportiospy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/ios.py (192126 => 192127)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -144,17 +144,13 @@
</span><span class="cx"> return False
</span><span class="cx"> return True
</span><span class="cx">
</span><del>- def _check_build_relay(self):
- if self.get_option('build') and not self._build_relay():
</del><ins>+ def _check_port_build(self):
+ if not self._root_was_set and self.get_option('build') and not self._build_relay():
</ins><span class="cx"> return False
</span><span class="cx"> if not self._check_relay():
</span><span class="cx"> return False
</span><span class="cx"> return True
</span><span class="cx">
</span><del>- def check_build(self, needs_http):
- needs_driver = super(IOSSimulatorPort, self).check_build(needs_http)
- return needs_driver and self._check_build_relay()
-
</del><span class="cx"> def _build_relay(self):
</span><span class="cx"> environment = self.host.copy_current_environment()
</span><span class="cx"> environment.disable_gcc_smartquotes()
</span></span></pre>
</div>
</div>
</body>
</html>