<!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>[205351] 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/205351">205351</a></dd>
<dt>Author</dt> <dd>jbedard@apple.com</dd>
<dt>Date</dt> <dd>2016-09-02 10:59:18 -0700 (Fri, 02 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix --no-sample-on-timeout command line argument
https://bugs.webkit.org/show_bug.cgi?id=161507
Reviewed by Alexey Proskuryakov.
This patch fixes the —no-sample-on-timeout flag and correctly names spindumps as spindump.txt.
* Scripts/webkitpy/layout_tests/run_webkit_tests.py:
(parse_args): Fixed —-no-sample-on-timeout.
* Scripts/webkitpy/port/apple.py:
(ApplePort.sample_process): Use correct file name.
(ApplePort.spindump_file_path): Spindump and sample file names are different.
* Scripts/webkitpy/port/driver.py:
(Driver._check_for_driver_timeout): Check “sample_on_timeout” flag.
* Scripts/webkitpy/port/mac_unittest.py:
(MacTest.test_spindump): Modified for correct filename.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testsrun_webkit_testspy">trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportapplepy">trunk/Tools/Scripts/webkitpy/port/apple.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportdriverpy">trunk/Tools/Scripts/webkitpy/port/driver.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportmac_unittestpy">trunk/Tools/Scripts/webkitpy/port/mac_unittest.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (205350 => 205351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-09-02 17:58:13 UTC (rev 205350)
+++ trunk/Tools/ChangeLog 2016-09-02 17:59:18 UTC (rev 205351)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2016-09-02 Jonathan Bedard <jbedard@apple.com>
</span><span class="cx">
</span><ins>+ Fix --no-sample-on-timeout command line argument
+ https://bugs.webkit.org/show_bug.cgi?id=161507
+
+ Reviewed by Alexey Proskuryakov.
+
+ This patch fixes the —no-sample-on-timeout flag and correctly names spindumps as spindump.txt.
+
+ * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+ (parse_args): Fixed —-no-sample-on-timeout.
+ * Scripts/webkitpy/port/apple.py:
+ (ApplePort.sample_process): Use correct file name.
+ (ApplePort.spindump_file_path): Spindump and sample file names are different.
+ * Scripts/webkitpy/port/driver.py:
+ (Driver._check_for_driver_timeout): Check “sample_on_timeout” flag.
+ * Scripts/webkitpy/port/mac_unittest.py:
+ (MacTest.test_spindump): Modified for correct filename.
+
+2016-09-02 Jonathan Bedard <jbedard@apple.com>
+
</ins><span class="cx"> Unreviewed: moved myself to the reviewers list.
</span><span class="cx">
</span><span class="cx"> * Scripts/webkitpy/common/config/contributors.json:
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testsrun_webkit_testspy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py (205350 => 205351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py 2016-09-02 17:58:13 UTC (rev 205350)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py 2016-09-02 17:59:18 UTC (rev 205351)
</span><span class="lines">@@ -139,7 +139,7 @@
</span><span class="cx"> dest="pixel_tests", help="Enable pixel-to-pixel PNG comparisons"),
</span><span class="cx"> optparse.make_option("--no-pixel", "--no-pixel-tests", action="store_false",
</span><span class="cx"> dest="pixel_tests", help="Disable pixel-to-pixel PNG comparisons"),
</span><del>- optparse.make_option("--no-sample-on-timeout", action="store_false",
</del><ins>+ optparse.make_option("--no-sample-on-timeout", action="store_false", default=True,
</ins><span class="cx"> dest="sample_on_timeout", help="Don't run sample on timeout (OS X only)"),
</span><span class="cx"> optparse.make_option("--no-ref-tests", action="store_true",
</span><span class="cx"> dest="no_ref_tests", help="Skip all ref tests"),
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportapplepy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/apple.py (205350 => 205351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/apple.py 2016-09-02 17:58:13 UTC (rev 205350)
+++ trunk/Tools/Scripts/webkitpy/port/apple.py 2016-09-02 17:59:18 UTC (rev 205351)
</span><span class="lines">@@ -198,7 +198,6 @@
</span><span class="cx"> return self._merge_crash_logs(crash_logs, all_crash_log, crashed_processes)
</span><span class="cx">
</span><span class="cx"> def sample_process(self, name, pid):
</span><del>- hang_report = self.sample_file_path(name, pid)
</del><span class="cx"> exit_status = self._executive.run_command([
</span><span class="cx"> "/usr/bin/sudo",
</span><span class="cx"> "-n",
</span><span class="lines">@@ -207,7 +206,7 @@
</span><span class="cx"> 10,
</span><span class="cx"> 10,
</span><span class="cx"> "-file",
</span><del>- hang_report,
</del><ins>+ self.spindump_file_path(name, pid),
</ins><span class="cx"> ], return_exit_code=True)
</span><span class="cx"> if exit_status:
</span><span class="cx"> try:
</span><span class="lines">@@ -217,7 +216,7 @@
</span><span class="cx"> 10,
</span><span class="cx"> 10,
</span><span class="cx"> "-file",
</span><del>- hang_report,
</del><ins>+ self.sample_file_path(name, pid),
</ins><span class="cx"> ])
</span><span class="cx"> except ScriptError as e:
</span><span class="cx"> _log.warning('Unable to sample process:' + str(e))
</span><span class="lines">@@ -225,6 +224,9 @@
</span><span class="cx"> def sample_file_path(self, name, pid):
</span><span class="cx"> return self._filesystem.join(self.results_directory(), "{0}-{1}-sample.txt".format(name, pid))
</span><span class="cx">
</span><ins>+ def spindump_file_path(self, name, pid):
+ return self._filesystem.join(self.results_directory(), "{0}-{1}-spindump.txt".format(name, pid))
+
</ins><span class="cx"> def look_for_new_samples(self, unresponsive_processes, start_time):
</span><span class="cx"> sample_files = {}
</span><span class="cx"> for (test_name, process_name, pid) in unresponsive_processes:
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportdriverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/driver.py (205350 => 205351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/driver.py 2016-09-02 17:58:13 UTC (rev 205350)
+++ trunk/Tools/Scripts/webkitpy/port/driver.py 2016-09-02 17:59:18 UTC (rev 205351)
</span><span class="lines">@@ -430,7 +430,8 @@
</span><span class="cx"> err_line = 'Wait on notifyDone timed out, process ' + child_process_name + ' pid = ' + str(child_process_pid)
</span><span class="cx"> self.error_from_test += err_line
</span><span class="cx"> _log.debug(err_line)
</span><del>- self._port.sample_process(child_process_name, child_process_pid)
</del><ins>+ if self._port.get_option("sample_on_timeout"):
+ self._port.sample_process(child_process_name, child_process_pid)
</ins><span class="cx"> if out_line == "FAIL: Timed out waiting for notifyDone to be called\n":
</span><span class="cx"> self._driver_timed_out = True
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportmac_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/mac_unittest.py (205350 => 205351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/mac_unittest.py 2016-09-02 17:58:13 UTC (rev 205350)
+++ trunk/Tools/Scripts/webkitpy/port/mac_unittest.py 2016-09-02 17:59:18 UTC (rev 205351)
</span><span class="lines">@@ -204,7 +204,7 @@
</span><span class="cx">
</span><span class="cx"> port = self.make_port()
</span><span class="cx"> port._executive = MockExecutive2(run_command_fn=logging_run_command)
</span><del>- expected_stdout = "['/usr/bin/sudo', '-n', '/usr/sbin/spindump', 42, 10, 10, '-file', '/mock-build/layout-test-results/test-42-sample.txt']\n"
</del><ins>+ expected_stdout = "['/usr/bin/sudo', '-n', '/usr/sbin/spindump', 42, 10, 10, '-file', '/mock-build/layout-test-results/test-42-spindump.txt']\n"
</ins><span class="cx"> OutputCapture().assert_outputs(self, port.sample_process, args=['test', 42], expected_stdout=expected_stdout)
</span><span class="cx">
</span><span class="cx"> def test_sample_process(self):
</span></span></pre>
</div>
</div>
</body>
</html>