<!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>[192635] 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/192635">192635</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2015-11-19 10:42:17 -0800 (Thu, 19 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Win] webkitpy is applying abspath to DOS paths, yielding invalid paths
https://bugs.webkit.org/show_bug.cgi?id=151156
Unreviewed test fix.
I tracked down the cause of the test regression on the Windows builders. Once I fixed that,
I realized that the new 'abs_results_directory' value was not needed, so this change reverts
that code.
* Scripts/webkitpy/port/base.py:
(Port.to.start_websocket_server): We don't need a special directory variable on Cygwin anymore.
(Port.abs_results_directory): Deleted.
* Scripts/webkitpy/port/win.py:
(WinPort.__init__): Deleted.
(WinPort.abs_results_directory): Deleted.
(WinPort.results_directory): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpyportbasepy">trunk/Tools/Scripts/webkitpy/port/base.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 (192634 => 192635)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-11-19 18:31:21 UTC (rev 192634)
+++ trunk/Tools/ChangeLog 2015-11-19 18:42:17 UTC (rev 192635)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-11-19 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] webkitpy is applying abspath to DOS paths, yielding invalid paths
+ https://bugs.webkit.org/show_bug.cgi?id=151156
+
+ Unreviewed test fix.
+
+ I tracked down the cause of the test regression on the Windows builders. Once I fixed that,
+ I realized that the new 'abs_results_directory' value was not needed, so this change reverts
+ that code.
+
+ * Scripts/webkitpy/port/base.py:
+ (Port.to.start_websocket_server): We don't need a special directory variable on Cygwin anymore.
+ (Port.abs_results_directory): Deleted.
+ * Scripts/webkitpy/port/win.py:
+ (WinPort.__init__): Deleted.
+ (WinPort.abs_results_directory): Deleted.
+ (WinPort.results_directory): Deleted.
+
</ins><span class="cx"> 2015-11-19 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> build.webkit.org/dashboard: Move layoutTestResultsDirectoryURLForIteration implementation to base class
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportbasepy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/base.py (192634 => 192635)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/base.py 2015-11-19 18:31:21 UTC (rev 192634)
+++ trunk/Tools/Scripts/webkitpy/port/base.py 2015-11-19 18:42:17 UTC (rev 192635)
</span><span class="lines">@@ -778,9 +778,6 @@
</span><span class="cx"> self._results_directory = self._filesystem.abspath(option_val)
</span><span class="cx"> return self._results_directory
</span><span class="cx">
</span><del>- def abs_results_directory(self):
- return self.results_directory()
-
</del><span class="cx"> def perf_results_directory(self):
</span><span class="cx"> return self._build_path()
</span><span class="cx">
</span><span class="lines">@@ -907,12 +904,7 @@
</span><span class="cx"> Ports can stub this out if they don't need a websocket server to be running."""
</span><span class="cx"> assert not self._websocket_server, 'Already running a websocket server.'
</span><span class="cx">
</span><del>- work_directory = self.results_directory()
- if self.host.platform.is_cygwin():
- # Cygwin socket server needs a UNIX path.
- work_directory = self.abs_results_directory()
-
- server = websocket_server.PyWebSocket(self, work_directory)
</del><ins>+ server = websocket_server.PyWebSocket(self, self.results_directory())
</ins><span class="cx"> server.start()
</span><span class="cx"> self._websocket_server = server
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportwinpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/win.py (192634 => 192635)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/win.py 2015-11-19 18:31:21 UTC (rev 192634)
+++ trunk/Tools/Scripts/webkitpy/port/win.py 2015-11-19 18:42:17 UTC (rev 192635)
</span><span class="lines">@@ -61,26 +61,6 @@
</span><span class="cx">
</span><span class="cx"> previous_error_reporting_values = {}
</span><span class="cx">
</span><del>- def __init__(self, host, port_name, **kwargs):
- ApplePort.__init__(self, host, port_name, **kwargs)
-
- self._abs_results_directory = None
-
- def abs_results_directory(self):
- if not self._results_directory:
- self.results_directory()
- return self._abs_results_directory
-
- def results_directory(self):
- """Absolute path to the place to store the test results (uses --results-directory)."""
- if not self._results_directory:
- option_val = self.get_option('results_directory') or self.default_results_directory()
- self._results_directory = self._filesystem.abspath(option_val)
- if sys.platform == 'cygwin':
- self._results_directory = cygpath(self._results_directory)
- self._abs_results_directory = self._filesystem.abspath(option_val)
- return self._results_directory
-
</del><span class="cx"> def do_text_results_differ(self, expected_text, actual_text):
</span><span class="cx"> # Sanity was restored in WK2, so we don't need this hack there.
</span><span class="cx"> if self.get_option('webkit_test_runner'):
</span></span></pre>
</div>
</div>
</body>
</html>