<!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>[179216] 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/179216">179216</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2015-01-27 14:07:50 -0800 (Tue, 27 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] run-webkit-tests --platform=ios* --lint-test-files does not work
https://bugs.webkit.org/show_bug.cgi?id=140949
Reviewed by Alexey Proskuryakov.
Add "ios-simulator" and "ios-simulator-wk2" to the list of ports without
builders so that run-webkit-tests can lint the appropriate TestExpectation
files.
* Scripts/webkitpy/port/builders.py:
* Scripts/webkitpy/port/ios.py:
(IOSSimulatorPort.__init__): Move logic to query for the Mac build directory from here...
(IOSSimulatorPort.relay_path): to here as this is the only caller that makes use of that
information to find the LayoutTestRelay tool. Otherwise, "self.assertEqual(len(calls), 1)"
in unit test webkitpy.tool.commands.rebaseline_unittest.TestRebaselineExpectations.test_rebaseline_expectations
will fail because IOSSimulatorPort.__init__() ultimately calls Tools/Scripts/webkit-build-directory
to determine the Mac build directory for each instantiation of IOSSimulatorPort. And this unit
test instantiates a port object for each builder listed in file Scripts/webkitpy/port/builders.py.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpyportbuilderspy">trunk/Tools/Scripts/webkitpy/port/builders.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 (179215 => 179216)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-01-27 22:05:58 UTC (rev 179215)
+++ trunk/Tools/ChangeLog 2015-01-27 22:07:50 UTC (rev 179216)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-01-27 Daniel Bates <dabates@apple.com>
+
+ [iOS] run-webkit-tests --platform=ios* --lint-test-files does not work
+ https://bugs.webkit.org/show_bug.cgi?id=140949
+
+ Reviewed by Alexey Proskuryakov.
+
+ Add "ios-simulator" and "ios-simulator-wk2" to the list of ports without
+ builders so that run-webkit-tests can lint the appropriate TestExpectation
+ files.
+
+ * Scripts/webkitpy/port/builders.py:
+ * Scripts/webkitpy/port/ios.py:
+ (IOSSimulatorPort.__init__): Move logic to query for the Mac build directory from here...
+ (IOSSimulatorPort.relay_path): to here as this is the only caller that makes use of that
+ information to find the LayoutTestRelay tool. Otherwise, "self.assertEqual(len(calls), 1)"
+ in unit test webkitpy.tool.commands.rebaseline_unittest.TestRebaselineExpectations.test_rebaseline_expectations
+ will fail because IOSSimulatorPort.__init__() ultimately calls Tools/Scripts/webkit-build-directory
+ to determine the Mac build directory for each instantiation of IOSSimulatorPort. And this unit
+ test instantiates a port object for each builder listed in file Scripts/webkitpy/port/builders.py.
+
+
</ins><span class="cx"> 2015-01-27 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Update bots on the flakiness dashboard
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportbuilderspy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/builders.py (179215 => 179216)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/builders.py 2015-01-27 22:05:58 UTC (rev 179215)
+++ trunk/Tools/Scripts/webkitpy/port/builders.py 2015-01-27 22:07:50 UTC (rev 179216)
</span><span class="lines">@@ -91,6 +91,8 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> _ports_without_builders = [
</span><ins>+ r"ios-simulator",
+ r"ios-simulator-wk2",
</ins><span class="cx"> ]
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportiospy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/ios.py (179215 => 179216)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/ios.py 2015-01-27 22:05:58 UTC (rev 179215)
+++ trunk/Tools/Scripts/webkitpy/port/ios.py 2015-01-27 22:07:50 UTC (rev 179216)
</span><span class="lines">@@ -96,8 +96,6 @@
</span><span class="cx"> # DumpRenderTree slows down noticably if we run more than about 1000 tests in a batch
</span><span class="cx"> # with MallocStackLogging enabled.
</span><span class="cx"> self.set_option_default("batch_size", 1000)
</span><del>- mac_config = port_config.Config(self._executive, self._filesystem, 'mac')
- self._mac_build_directory = mac_config.build_directory(self.get_option('configuration'))
</del><span class="cx">
</span><span class="cx"> self._testing_device = None
</span><span class="cx">
</span><span class="lines">@@ -110,7 +108,8 @@
</span><span class="cx">
</span><span class="cx"> @property
</span><span class="cx"> def relay_path(self):
</span><del>- return self._filesystem.join(self._mac_build_directory, self.relay_name)
</del><ins>+ 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)
</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>