<!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>[202819] 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/202819">202819</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2016-07-05 09:52:26 -0700 (Tue, 05 Jul 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>run-webkit-tests should print more complete baseline search paths
https://bugs.webkit.org/show_bug.cgi?id=159354

Reviewed by Daniel Bates.

run-webkit-tests used to only print directory names in baseline search paths.
This was ok in basic usage, but quickly got confusing when using
--additional-platform-directory flags.

* Scripts/webkitpy/layout_tests/views/printing.py:
(Printer.print_config):
* Scripts/webkitpy/layout_tests/views/printing_unittest.py:
(Testprinter.test_print_config):
(Testprinter.test_print_one_line_summary):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testsviewsprintingpy">trunk/Tools/Scripts/webkitpy/layout_tests/views/printing.py</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testsviewsprinting_unittestpy">trunk/Tools/Scripts/webkitpy/layout_tests/views/printing_unittest.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (202818 => 202819)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2016-07-05 15:49:28 UTC (rev 202818)
+++ trunk/Tools/ChangeLog        2016-07-05 16:52:26 UTC (rev 202819)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-07-05  Alexey Proskuryakov  &lt;ap@apple.com&gt;
+
+        run-webkit-tests should print more complete baseline search paths
+        https://bugs.webkit.org/show_bug.cgi?id=159354
+
+        Reviewed by Daniel Bates.
+
+        run-webkit-tests used to only print directory names in baseline search paths.
+        This was ok in basic usage, but quickly got confusing when using
+        --additional-platform-directory flags.
+
+        * Scripts/webkitpy/layout_tests/views/printing.py:
+        (Printer.print_config):
+        * Scripts/webkitpy/layout_tests/views/printing_unittest.py:
+        (Testprinter.test_print_config):
+        (Testprinter.test_print_one_line_summary):
+
</ins><span class="cx"> 2016-07-04  Brady Eidson  &lt;beidson@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         WebProcesses don't handle DatabaseProcess going away uncleanly..
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testsviewsprintingpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/views/printing.py (202818 => 202819)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/views/printing.py        2016-07-05 15:49:28 UTC (rev 202818)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/views/printing.py        2016-07-05 16:52:26 UTC (rev 202819)
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx">             self._print_default(&quot;Placing new baselines in %s&quot; % self._port.baseline_path())
</span><span class="cx"> 
</span><span class="cx">         fs = self._port.host.filesystem
</span><del>-        fallback_path = [fs.split(x)[1] for x in self._port.baseline_search_path()]
</del><ins>+        fallback_path = [fs.relpath(x, self._port.layout_tests_dir()).replace(&quot;../&quot;, &quot;&quot;) for x in self._port.baseline_search_path()]
</ins><span class="cx">         self._print_default(&quot;Baseline search path: %s -&gt; generic&quot; % &quot; -&gt; &quot;.join(fallback_path))
</span><span class="cx"> 
</span><span class="cx">         self._print_default(&quot;Using %s build&quot; % self._options.configuration)
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testsviewsprinting_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/views/printing_unittest.py (202818 => 202819)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/views/printing_unittest.py        2016-07-05 15:49:28 UTC (rev 202818)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/views/printing_unittest.py        2016-07-05 16:52:26 UTC (rev 202819)
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx">         self.assertIn(&quot;Using port 'test-mac-leopard'&quot;, err.getvalue())
</span><span class="cx">         self.assertIn('Test configuration: &lt;leopard, x86, release&gt;', err.getvalue())
</span><span class="cx">         self.assertIn('Placing test results in /tmp', err.getvalue())
</span><del>-        self.assertIn('Baseline search path: test-mac-leopard -&gt; test-mac-snowleopard -&gt; generic', err.getvalue())
</del><ins>+        self.assertIn('Baseline search path: platform/test-mac-leopard -&gt; platform/test-mac-snowleopard -&gt; generic', err.getvalue())
</ins><span class="cx">         self.assertIn('Using Release build', err.getvalue())
</span><span class="cx">         self.assertIn('Pixel tests enabled', err.getvalue())
</span><span class="cx">         self.assertIn('Command line:', err.getvalue())
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx">         self.reset(err)
</span><span class="cx">         printer._options.quiet = True
</span><span class="cx">         printer.print_config('/tmp')
</span><del>-        self.assertNotIn('Baseline search path: test-mac-leopard -&gt; test-mac-snowleopard -&gt; generic', err.getvalue())
</del><ins>+        self.assertNotIn('Baseline search path: platform/test-mac-leopard -&gt; platform/test-mac-snowleopard -&gt; generic', err.getvalue())
</ins><span class="cx"> 
</span><span class="cx">     def test_print_one_line_summary(self):
</span><span class="cx">         printer, err = self.get_printer()
</span></span></pre>
</div>
</div>

</body>
</html>