<!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>[192087] 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/192087">192087</a></dd>
<dt>Author</dt> <dd>jmarcell@apple.com</dd>
<dt>Date</dt> <dd>2015-11-05 16:06:56 -0800 (Thu, 05 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>run-webkit-test should look in --root directory for LayoutTestRelay
https://bugs.webkit.org/show_bug.cgi?id=150859
Reviewed by Daniel Bates.
For iOS run-webkit-tests, use LayoutTestRelay specified by --root; otherwise find
LayoutTestRelay in the Mac build directory when --root is unspecified.
* Scripts/webkitpy/port/base.py:
(Port._build_path): Use '_cached_root' instead of 'root' so that we don't overwrite the
argument that was passed in via the --root argument.
* Scripts/webkitpy/port/ios.py:
(IOSSimulatorPort.relay_path):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpyportbasepy">trunk/Tools/Scripts/webkitpy/port/base.py</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 (192086 => 192087)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-11-06 00:03:59 UTC (rev 192086)
+++ trunk/Tools/ChangeLog 2015-11-06 00:06:56 UTC (rev 192087)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-11-05 Jason Marcell <jmarcell@apple.com>
+
+ run-webkit-test should look in --root directory for LayoutTestRelay
+ https://bugs.webkit.org/show_bug.cgi?id=150859
+
+ Reviewed by Daniel Bates.
+
+ For iOS run-webkit-tests, use LayoutTestRelay specified by --root; otherwise find
+ LayoutTestRelay in the Mac build directory when --root is unspecified.
+
+ * Scripts/webkitpy/port/base.py:
+ (Port._build_path): Use '_cached_root' instead of 'root' so that we don't overwrite the
+ argument that was passed in via the --root argument.
+ * Scripts/webkitpy/port/ios.py:
+ (IOSSimulatorPort.relay_path):
+
</ins><span class="cx"> 2015-11-05 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> TestWebKitAPI crashed in TestWebKitAPI: TestWebKitAPI::SharedBufferTest_copyBufferCreatedWithContentsOfExistingFile_Test::TestBody
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportbasepy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/base.py (192086 => 192087)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/base.py 2015-11-06 00:03:59 UTC (rev 192086)
+++ trunk/Tools/Scripts/webkitpy/port/base.py 2015-11-06 00:06:56 UTC (rev 192087)
</span><span class="lines">@@ -1133,18 +1133,22 @@
</span><span class="cx"> return self._filesystem.join(self.layout_tests_dir(), 'http', 'conf', config_file_name)
</span><span class="cx">
</span><span class="cx"> def _build_path(self, *comps):
</span><del>- root_directory = self.get_option('root')
</del><ins>+ root_directory = self.get_option('_cached_root') or self.get_option('root')
</ins><span class="cx"> if not root_directory:
</span><span class="cx"> build_directory = self.get_option('build_directory')
</span><span class="cx"> if build_directory:
</span><span class="cx"> root_directory = self._filesystem.join(build_directory, self.get_option('configuration'))
</span><span class="cx"> else:
</span><span class="cx"> root_directory = self._config.build_directory(self.get_option('configuration'))
</span><del>- # Set --root so that we can pass this to subprocesses and avoid making the
- # slow call to config.build_directory() N times in each worker.
- # FIXME: This is like @memoized, but more annoying and fragile; there should be another
- # way to propagate values without mutating the options list.
- self.set_option_default('root', root_directory)
</del><ins>+ # We take advantage of the behavior that self._options is passed by reference to worker
+ # subprocesses to use it as data store to cache the computed root directory path. This
+ # avoids making each worker subprocess compute this path again which is slow because of
+ # the call to config.build_directory().
+ #
+ # FIXME: This is like decorating this function with @memoized, but more annoying and fragile;
+ # there should be another way to propagate precomputed values to workers without modifying
+ # the options list.
+ self.set_option('_cached_root', root_directory)
</ins><span class="cx"> return self._filesystem.join(self._filesystem.abspath(root_directory), *comps)
</span><span class="cx">
</span><span class="cx"> def _path_to_driver(self, configuration=None):
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportiospy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/ios.py (192086 => 192087)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/ios.py 2015-11-06 00:03:59 UTC (rev 192086)
+++ trunk/Tools/Scripts/webkitpy/port/ios.py 2015-11-06 00:06:56 UTC (rev 192087)
</span><span class="lines">@@ -123,8 +123,12 @@
</span><span class="cx"> @property
</span><span class="cx"> @memoized
</span><span class="cx"> def relay_path(self):
</span><del>- mac_config = port_config.Config(self._executive, self._filesystem, 'mac')
- return self._filesystem.join(mac_config.build_directory(self.get_option('configuration')), self.relay_name)
</del><ins>+ if self._root_was_set:
+ path = self._filesystem.abspath(self.get_option('root'))
+ else:
+ mac_config = port_config.Config(self._executive, self._filesystem, 'mac')
+ path = mac_config.build_directory(self.get_option('configuration'))
+ return self._filesystem.join(path, self.relay_name)
</ins><span class="cx">
</span><span class="cx"> def default_timeout_ms(self):
</span><span class="cx"> if self.get_option('guard_malloc'):
</span></span></pre>
</div>
</div>
</body>
</html>