<!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>[190924] 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/190924">190924</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2015-10-12 22:08:52 -0700 (Mon, 12 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix webkitpy tests after <a href="http://trac.webkit.org/projects/webkit/changeset/190922">r190922</a>.
* Scripts/webkitpy/common/config/ews.json:
* Scripts/webkitpy/tool/commands/earlywarningsystem.py:
* Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonconfigewsjson">trunk/Tools/Scripts/webkitpy/common/config/ews.json</a></li>
<li><a href="#trunkToolsScriptswebkitpytoolcommandsearlywarningsystempy">trunk/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem.py</a></li>
<li><a href="#trunkToolsScriptswebkitpytoolcommandsearlywarningsystem_unittestpy">trunk/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (190923 => 190924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-10-13 03:24:02 UTC (rev 190923)
+++ trunk/Tools/ChangeLog 2015-10-13 05:08:52 UTC (rev 190924)
</span><span class="lines">@@ -1,5 +1,13 @@
</span><span class="cx"> 2015-10-12 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><ins>+ Fix webkitpy tests after r190922.
+
+ * Scripts/webkitpy/common/config/ews.json:
+ * Scripts/webkitpy/tool/commands/earlywarningsystem.py:
+ * Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py:
+
+2015-10-12 Alexey Proskuryakov <ap@apple.com>
+
</ins><span class="cx"> Add a Mac debug EWS queue
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=150069
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonconfigewsjson"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/config/ews.json (190923 => 190924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/config/ews.json 2015-10-13 03:24:02 UTC (rev 190923)
+++ trunk/Tools/Scripts/webkitpy/common/config/ews.json 2015-10-13 05:08:52 UTC (rev 190924)
</span><span class="lines">@@ -39,6 +39,6 @@
</span><span class="cx"> "port": "mac",
</span><span class="cx"> "name": "mac-debug-32bit-ews",
</span><span class="cx"> "style": "debug",
</span><del>- "architecture": "i386",
</del><ins>+ "architecture": "i386"
</ins><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpytoolcommandsearlywarningsystempy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem.py (190923 => 190924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem.py 2015-10-13 03:24:02 UTC (rev 190923)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem.py 2015-10-13 05:08:52 UTC (rev 190924)
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx"> return self._layout_test_results_reader.archive(patch)
</span><span class="cx">
</span><span class="cx"> def build_style(self):
</span><del>- return self.build_style
</del><ins>+ return self._build_style
</ins><span class="cx">
</span><span class="cx"> def refetch_patch(self, patch):
</span><span class="cx"> return self._tool.bugs.fetch_attachment(patch.id())
</span><span class="lines">@@ -149,11 +149,11 @@
</span><span class="cx">
</span><span class="cx"> classes = []
</span><span class="cx"> for name, config in ewses.iteritems():
</span><del>- classes.append(type(str(name).translate(None, ' -'), (AbstractEarlyWarningSystem,), {
</del><ins>+ classes.append(type(name.encode('utf-8').translate(None, ' -'), (AbstractEarlyWarningSystem,), {
</ins><span class="cx"> 'name': config.get('name', config['port'] + '-ews'),
</span><span class="cx"> 'port_name': config['port'],
</span><span class="cx"> 'architecture': config.get('architecture', None),
</span><del>- 'build_style': config.get('style', "release"),
</del><ins>+ '_build_style': config.get('style', "release"),
</ins><span class="cx"> 'watchers': config.get('watchers', []),
</span><span class="cx"> 'run_tests': config.get('runTests', cls.run_tests),
</span><span class="cx"> }))
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpytoolcommandsearlywarningsystem_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py (190923 => 190924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py 2015-10-13 03:24:02 UTC (rev 190923)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py 2015-10-13 05:08:52 UTC (rev 190924)
</span><span class="lines">@@ -64,6 +64,7 @@
</span><span class="cx"> "name": ews.name,
</span><span class="cx"> "port": ews.port_name,
</span><span class="cx"> "architecture": " --architecture=%s" % ews.architecture if ews.architecture else "",
</span><ins>+ "build_style": ews.build_style(),
</ins><span class="cx"> }
</span><span class="cx"> if ews.run_tests:
</span><span class="cx"> run_tests_line = "Running: webkit-patch --status-host=example.com build-and-test --no-clean --no-update --test --non-interactive --port=%(port)s%(architecture)s\n" % string_replacements
</span><span class="lines">@@ -76,7 +77,7 @@
</span><span class="cx"> "process_work_item": """Running: webkit-patch --status-host=example.com clean --port=%(port)s%(architecture)s
</span><span class="cx"> Running: webkit-patch --status-host=example.com update --port=%(port)s%(architecture)s
</span><span class="cx"> Running: webkit-patch --status-host=example.com apply-attachment --no-update --non-interactive 10000 --port=%(port)s%(architecture)s
</span><del>-Running: webkit-patch --status-host=example.com build --no-clean --no-update --build-style=release --port=%(port)s%(architecture)s
</del><ins>+Running: webkit-patch --status-host=example.com build --no-clean --no-update --build-style=%(build_style)s --port=%(port)s%(architecture)s
</ins><span class="cx"> %(run_tests_line)sMOCK: update_status: %(name)s Pass
</span><span class="cx"> MOCK: release_work_item: %(name)s 10000
</span><span class="cx"> """ % string_replacements,
</span></span></pre>
</div>
</div>
</body>
</html>