<!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>[173290] 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/173290">173290</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2014-09-04 16:47:36 -0700 (Thu, 04 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Win] webkitpy test suite frequently fails to complete
https://bugs.webkit.org/show_bug.cgi?id=136546
Reviewed by Daniel Bates.
Properly convert the ASCII crash log produced by ntsd into
a unicode string as early as possible so that we handle it
properly when generating our logs and other test support output.
We were mixing ASCII/unicode strings under Windows, which was
causing test system failures when we processed some crash logs.
Also do a better job of handling garbage pid entries in the
Cygwin lock files.
* Scripts/webkitpy/common/system/crashlogs.py:
(CrashLogs._find_newest_log_win): The ntsd '.logopen' command
creates an ASCII file. Decode it as ASCII, not 'utf-8', and
handle the strings as unicode from that point on.
* Scripts/webkitpy/port/http_lock.py:
(HttpLock._current_lock_pid): Add logging and handle case of
the current_pid failing to cleanly convert to 'int'.
* Scripts/webkitpy/port/win.py:
(WinPort): Add 64-bit architecture as a known target for the
Windows build.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonsystemcrashlogspy">trunk/Tools/Scripts/webkitpy/common/system/crashlogs.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyporthttp_lockpy">trunk/Tools/Scripts/webkitpy/port/http_lock.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportwinpy">trunk/Tools/Scripts/webkitpy/port/win.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (173289 => 173290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-09-04 23:38:51 UTC (rev 173289)
+++ trunk/Tools/ChangeLog 2014-09-04 23:47:36 UTC (rev 173290)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2014-09-04 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] webkitpy test suite frequently fails to complete
+ https://bugs.webkit.org/show_bug.cgi?id=136546
+
+ Reviewed by Daniel Bates.
+
+ Properly convert the ASCII crash log produced by ntsd into
+ a unicode string as early as possible so that we handle it
+ properly when generating our logs and other test support output.
+
+ We were mixing ASCII/unicode strings under Windows, which was
+ causing test system failures when we processed some crash logs.
+
+ Also do a better job of handling garbage pid entries in the
+ Cygwin lock files.
+
+ * Scripts/webkitpy/common/system/crashlogs.py:
+ (CrashLogs._find_newest_log_win): The ntsd '.logopen' command
+ creates an ASCII file. Decode it as ASCII, not 'utf-8', and
+ handle the strings as unicode from that point on.
+ * Scripts/webkitpy/port/http_lock.py:
+ (HttpLock._current_lock_pid): Add logging and handle case of
+ the current_pid failing to cleanly convert to 'int'.
+ * Scripts/webkitpy/port/win.py:
+ (WinPort): Add 64-bit architecture as a known target for the
+ Windows build.
+
</ins><span class="cx"> 2014-09-04 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> Address additional review feedback after landing r173283.
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonsystemcrashlogspy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/system/crashlogs.py (173289 => 173290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/system/crashlogs.py 2014-09-04 23:38:51 UTC (rev 173289)
+++ trunk/Tools/Scripts/webkitpy/common/system/crashlogs.py 2014-09-04 23:47:36 UTC (rev 173290)
</span><span class="lines">@@ -85,11 +85,11 @@
</span><span class="cx"> return basename.startswith("CrashLog")
</span><span class="cx">
</span><span class="cx"> logs = self._host.filesystem.files_under(self._results_directory, file_filter=is_crash_log)
</span><del>- errors = ''
</del><ins>+ errors = u''
</ins><span class="cx"> for path in reversed(sorted(logs)):
</span><span class="cx"> try:
</span><span class="cx"> if not newer_than or self._host.filesystem.mtime(path) > newer_than:
</span><del>- log_file = self._host.filesystem.read_binary_file(path).decode('utf8', 'ignore')
</del><ins>+ log_file = self._host.filesystem.read_binary_file(path).decode('ascii', 'ignore')
</ins><span class="cx"> match = self.PID_LINE_REGEX.search(log_file)
</span><span class="cx"> if match is None:
</span><span class="cx"> continue
</span><span class="lines">@@ -98,15 +98,15 @@
</span><span class="cx"> except IOError, e:
</span><span class="cx"> print "IOError %s" % str(e)
</span><span class="cx"> if include_errors:
</span><del>- errors += "ERROR: Failed to read '%s': %s\n" % (path, str(e))
</del><ins>+ errors += u"ERROR: Failed to read '%s': %s\n" % (path, str(e))
</ins><span class="cx"> except OSError, e:
</span><span class="cx"> print "OSError %s" % str(e)
</span><span class="cx"> if include_errors:
</span><del>- errors += "ERROR: Failed to read '%s': %s\n" % (path, str(e))
</del><ins>+ errors += u"ERROR: Failed to read '%s': %s\n" % (path, str(e))
</ins><span class="cx"> except UnicodeDecodeError, e:
</span><span class="cx"> print "UnicodeDecodeError %s" % str(e)
</span><span class="cx"> if include_errors:
</span><del>- errors += "ERROR: Failed to decode '%s' as utf8: %s\n" % (path, str(e))
</del><ins>+ errors += u"ERROR: Failed to decode '%s' as ascii: %s\n" % (path, str(e))
</ins><span class="cx">
</span><span class="cx"> if include_errors and errors:
</span><span class="cx"> return errors
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyporthttp_lockpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/http_lock.py (173289 => 173290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/http_lock.py 2014-09-04 23:38:51 UTC (rev 173289)
+++ trunk/Tools/Scripts/webkitpy/port/http_lock.py 2014-09-04 23:47:36 UTC (rev 173290)
</span><span class="lines">@@ -91,11 +91,23 @@
</span><span class="cx"> _log.debug("No lock file list")
</span><span class="cx"> return
</span><span class="cx"> try:
</span><del>- current_pid = self._filesystem.read_text_file(lock_list[0])
- if not (current_pid and self._executive.check_running_pid(int(current_pid))):
- _log.debug("Removing stuck lock file: %s" % lock_list[0])
</del><ins>+ _log.debug("Retrieving current lock pid from %s" % lock_list[0])
+ current_pid_string = self._filesystem.read_text_file(lock_list[0])
+ _log.debug("Checking current lock on pid %s" % current_pid_string)
+ if not current_pid_string:
</ins><span class="cx"> self._filesystem.remove(lock_list[0])
</span><span class="cx"> return
</span><ins>+
+ try:
+ current_pid = int(current_pid_string)
+ if not (current_pid and self._executive.check_running_pid(current_pid)):
+ _log.debug("Removing stuck lock file: %s" % lock_list[0])
+ self._filesystem.remove(lock_list[0])
+ return
+ except ValueError, e:
+ _log.debug("ValueError: %s" % e)
+ self._filesystem.remove(lock_list[0])
+ return
</ins><span class="cx"> except IOError, e:
</span><span class="cx"> _log.debug("IOError: %s" % e)
</span><span class="cx"> return
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportwinpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/win.py (173289 => 173290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/win.py 2014-09-04 23:38:51 UTC (rev 173289)
+++ trunk/Tools/Scripts/webkitpy/port/win.py 2014-09-04 23:47:36 UTC (rev 173290)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx">
</span><span class="cx"> VERSION_FALLBACK_ORDER = ["win-xp", "win-vista", "win-7sp0", "win"]
</span><span class="cx">
</span><del>- ARCHITECTURES = ['x86']
</del><ins>+ ARCHITECTURES = ['x86', 'x86_64']
</ins><span class="cx">
</span><span class="cx"> CRASH_LOG_PREFIX = "CrashLog"
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>