<!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>[194226] 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/194226">194226</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-12-17 12:28:50 -0800 (Thu, 17 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>run-webkit-tests shouldn't start multiple iOS simulators while only running one test
https://bugs.webkit.org/show_bug.cgi?id=152157
<rdar://problem/23851817>
Patch by Aakash Jain <aakash_jain@apple.com> on 2015-12-17
Reviewed by Alexey Proskuryakov.
* Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py:
(LayoutTestRunner.get_worker_count): Calculate required number of workers.
* Scripts/webkitpy/layout_tests/controllers/manager.py:
(Manager._get_test_inputs): Common method to calculate test_inputs.
(Manager._update_worker_count): Calculate and update required number of workers.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testscontrollerslayout_test_runnerpy">trunk/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testscontrollersmanagerpy">trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (194225 => 194226)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-12-17 20:21:19 UTC (rev 194225)
+++ trunk/Tools/ChangeLog 2015-12-17 20:28:50 UTC (rev 194226)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-12-17 Aakash Jain <aakash_jain@apple.com>
+
+ run-webkit-tests shouldn't start multiple iOS simulators while only running one test
+ https://bugs.webkit.org/show_bug.cgi?id=152157
+ <rdar://problem/23851817>
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py:
+ (LayoutTestRunner.get_worker_count): Calculate required number of workers.
+ * Scripts/webkitpy/layout_tests/controllers/manager.py:
+ (Manager._get_test_inputs): Common method to calculate test_inputs.
+ (Manager._update_worker_count): Calculate and update required number of workers.
+
</ins><span class="cx"> 2015-12-16 Aakash Jain <aakash_jain@apple.com>
</span><span class="cx">
</span><span class="cx"> run-webkit-tests fails to delete Simulator device during cleanup
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testscontrollerslayout_test_runnerpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py (194225 => 194226)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py 2015-12-17 20:21:19 UTC (rev 194225)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py 2015-12-17 20:28:50 UTC (rev 194226)
</span><span class="lines">@@ -78,6 +78,10 @@
</span><span class="cx"> self._retrying = False
</span><span class="cx"> self._current_run_results = None
</span><span class="cx">
</span><ins>+ def get_worker_count(self, test_inputs, child_process_count):
+ all_shards = self._sharder.shard_tests(test_inputs, child_process_count, self._options.fully_parallel)
+ return min(child_process_count, len(all_shards))
+
</ins><span class="cx"> def run_tests(self, expectations, test_inputs, tests_to_skip, num_workers, needs_http, needs_websockets, needs_web_platform_test_server, retrying):
</span><span class="cx"> self._expectations = expectations
</span><span class="cx"> self._test_inputs = test_inputs
</span><span class="lines">@@ -106,7 +110,6 @@
</span><span class="cx"> if (self._needs_http and self._options.http) or self._needs_web_platform_test_server:
</span><span class="cx"> self.start_servers()
</span><span class="cx">
</span><del>- num_workers = min(num_workers, len(all_shards))
</del><span class="cx"> self._printer.print_workers_and_shards(num_workers, len(all_shards))
</span><span class="cx">
</span><span class="cx"> if self._options.dry_run:
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testscontrollersmanagerpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py (194225 => 194226)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py 2015-12-17 20:21:19 UTC (rev 194225)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py 2015-12-17 20:28:50 UTC (rev 194226)
</span><span class="lines">@@ -135,6 +135,19 @@
</span><span class="cx"> def needs_servers(self, test_names):
</span><span class="cx"> return any(self._is_http_test(test_name) for test_name in test_names) and self._options.http
</span><span class="cx">
</span><ins>+ def _get_test_inputs(self, tests_to_run, repeat_each, iterations):
+ test_inputs = []
+ for _ in xrange(iterations):
+ for test in tests_to_run:
+ for _ in xrange(repeat_each):
+ test_inputs.append(self._test_input_for_file(test))
+ return test_inputs
+
+ def _update_worker_count(self, test_names):
+ test_inputs = self._get_test_inputs(test_names, self._options.repeat_each, self._options.iterations)
+ worker_count = self._runner.get_worker_count(test_inputs, int(self._options.child_processes))
+ self._options.child_processes = worker_count
+
</ins><span class="cx"> def _set_up_run(self, test_names):
</span><span class="cx"> self._printer.write_update("Checking build ...")
</span><span class="cx"> if not self._port.check_build(self.needs_servers(test_names)):
</span><span class="lines">@@ -147,6 +160,7 @@
</span><span class="cx"> if not self._port.start_helper(self._options.pixel_tests):
</span><span class="cx"> return False
</span><span class="cx">
</span><ins>+ self._update_worker_count(test_names)
</ins><span class="cx"> self._port.reset_preferences()
</span><span class="cx">
</span><span class="cx"> # Check that the system dependencies (themes, fonts, ...) are correct.
</span><span class="lines">@@ -251,11 +265,7 @@
</span><span class="cx"> needs_web_platform_test_server = any(self._is_web_platform_test(test) for test in tests_to_run)
</span><span class="cx"> needs_websockets = any(self._is_websocket_test(test) for test in tests_to_run)
</span><span class="cx">
</span><del>- test_inputs = []
- for _ in xrange(iterations):
- for test in tests_to_run:
- for _ in xrange(repeat_each):
- test_inputs.append(self._test_input_for_file(test))
</del><ins>+ test_inputs = self._get_test_inputs(tests_to_run, repeat_each, iterations)
</ins><span class="cx"> return self._runner.run_tests(self._expectations, test_inputs, tests_to_skip, num_workers, needs_http, needs_websockets, needs_web_platform_test_server, retrying)
</span><span class="cx">
</span><span class="cx"> def _clean_up_run(self):
</span></span></pre>
</div>
</div>
</body>
</html>