<!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>[179616] 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/179616">179616</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2015-02-04 10:38:57 -0800 (Wed, 04 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>run-webkit-tests doesn't always capture ASan violation reports
https://bugs.webkit.org/show_bug.cgi?id=141231
Reviewed by Darin Adler.
* Scripts/webkitpy/port/driver.py:
(Driver.run_test): Don't look for CrashReporter crash logs if a log was provided
by the driver already (as is the case with ASan violations, which are printed to
stderr).
(Driver._check_for_address_sanitizer_violation): Check if the line is a start of ASan
report.
(Driver._read_block): Give ASan enough time to symbolicate a crash, and put it into
a separate variable for reporting.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpyportdriverpy">trunk/Tools/Scripts/webkitpy/port/driver.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (179615 => 179616)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-02-04 18:30:40 UTC (rev 179615)
+++ trunk/Tools/ChangeLog 2015-02-04 18:38:57 UTC (rev 179616)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-02-04 Alexey Proskuryakov <ap@apple.com>
+
+ run-webkit-tests doesn't always capture ASan violation reports
+ https://bugs.webkit.org/show_bug.cgi?id=141231
+
+ Reviewed by Darin Adler.
+
+ * Scripts/webkitpy/port/driver.py:
+ (Driver.run_test): Don't look for CrashReporter crash logs if a log was provided
+ by the driver already (as is the case with ASan violations, which are printed to
+ stderr).
+ (Driver._check_for_address_sanitizer_violation): Check if the line is a start of ASan
+ report.
+ (Driver._read_block): Give ASan enough time to symbolicate a crash, and put it into
+ a separate variable for reporting.
+
</ins><span class="cx"> 2015-02-03 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> [webkitpy] Add platform specific Skipped file mechanism for performance tests
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportdriverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/driver.py (179615 => 179616)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/driver.py 2015-02-04 18:30:40 UTC (rev 179615)
+++ trunk/Tools/Scripts/webkitpy/port/driver.py 2015-02-04 18:38:57 UTC (rev 179616)
</span><span class="lines">@@ -175,6 +175,7 @@
</span><span class="cx"> self.start(driver_input.should_run_pixel_test, driver_input.args)
</span><span class="cx"> test_begin_time = time.time()
</span><span class="cx"> self._driver_timed_out = False
</span><ins>+ self._crash_report_from_driver = None
</ins><span class="cx"> self.error_from_test = str()
</span><span class="cx"> self.err_seen_eof = False
</span><span class="cx">
</span><span class="lines">@@ -207,7 +208,9 @@
</span><span class="cx"> self._server_process = None
</span><span class="cx">
</span><span class="cx"> crash_log = None
</span><del>- if crashed:
</del><ins>+ if self._crash_report_from_driver:
+ crash_log = self._crash_report_from_driver
+ elif crashed:
</ins><span class="cx"> self.error_from_test, crash_log = self._get_crash_log(text, self.error_from_test, newer_than=start_time)
</span><span class="cx"> # If we don't find a crash log use a placeholder error message instead.
</span><span class="cx"> if not crash_log:
</span><span class="lines">@@ -378,6 +381,10 @@
</span><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><ins>+ def _check_for_address_sanitizer_violation(self, error_line):
+ if "ERROR: AddressSanitizer" in error_line:
+ return True
+
</ins><span class="cx"> def _check_for_driver_crash_or_unresponsiveness(self, error_line):
</span><span class="cx"> if error_line == "#CRASHED\n":
</span><span class="cx"> self._crashed_process_name = self._server_process.name()
</span><span class="lines">@@ -472,6 +479,7 @@
</span><span class="cx"> def _read_block(self, deadline, wait_for_stderr_eof=False):
</span><span class="cx"> block = ContentBlock()
</span><span class="cx"> out_seen_eof = False
</span><ins>+ asan_violation_detected = False
</ins><span class="cx">
</span><span class="cx"> while not self.has_crashed():
</span><span class="cx"> if out_seen_eof and (self.err_seen_eof or not wait_for_stderr_eof):
</span><span class="lines">@@ -510,8 +518,27 @@
</span><span class="cx"> if err_line:
</span><span class="cx"> if self._check_for_driver_crash_or_unresponsiveness(err_line):
</span><span class="cx"> break
</span><del>- self.error_from_test += err_line
</del><ins>+ elif self._check_for_address_sanitizer_violation(err_line):
+ asan_violation_detected = True
+ self._crash_report_from_driver = ""
+ # ASan report starts with a nondescript line, we only detect the second line.
+ end_of_previous_error_line = self.error_from_test.rfind('\n', 0, -1)
+ if end_of_previous_error_line > 0:
+ self.error_from_test = self.error_from_test[:end_of_previous_error_line]
+ else:
+ self.error_from_test = ""
+ # Symbolication can take a very long time, give it 10 extra minutes to finish.
+ # FIXME: This can likely be removed once <rdar://problem/18701447> is fixed.
+ deadline += 10 * 60 * 1000
+ if asan_violation_detected:
+ self._crash_report_from_driver += err_line
+ else:
+ self.error_from_test += err_line
</ins><span class="cx">
</span><ins>+ if asan_violation_detected and not self._crashed_process_name:
+ self._crashed_process_name = self._server_process.name()
+ self._crashed_pid = self._server_process.pid()
+
</ins><span class="cx"> block.decode_content()
</span><span class="cx"> return block
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>