<!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>[234863] 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/234863">234863</a></dd>
<dt>Author</dt> <dd>ross.kirsling@sony.com</dd>
<dt>Date</dt> <dd>2018-08-14 15:43:39 -0700 (Tue, 14 Aug 2018)</dd>
</dl>

<h3>Log Message</h3>
<pre>[webkitpy][Win] LayoutTests: test names should be Unix style, separated by slash not backslash
https://bugs.webkit.org/show_bug.cgi?id=187973

Patch by Fujii Hironori <Hironori.Fujii@sony.com> on 2018-08-14
Reviewed by Alex Christensen.

In LayoutTests, test names have been canonicalized in Unix style
since Bug 63597, for example 'fast/css/001.html'. But Bug 179219,
Bug 179572, Bug 180660, and Bug 181814 have changed to use
os.path.seq instead of slash if Windows Python is used.

Revert parts of those changes. Change relative_test_filename to
return a slash-separated test name as chromium_win.py used to do.

This change fixes all 41 test-webkitpy failures in WinCairo port.

* Scripts/webkitpy/layout_tests/models/test_expectations.py:
(TestExpectationParser._parse_line): Do not convert test names with normpath.
* Scripts/webkitpy/port/base.py:
(Port.normalize_test_name): Use TEST_PATH_SEPARATOR instead of os.path.sep.
(Port.relative_test_filename): Replace self.host.filesystem.sep with self.TEST_PATH_SEPARATOR.
(Port.abspath_for_test): Replace self.TEST_PATH_SEPARATOR with self.host.filesystem.sep.
* Scripts/webkitpy/port/driver.py:
(Driver): Use '/' instead of os.sep.
* Scripts/webkitpy/port/win.py:
(WinCairoPort): Do not override TEST_PATH_SEPARATOR.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testsmodelstest_expectationspy">trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportbasepy">trunk/Tools/Scripts/webkitpy/port/base.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportdriverpy">trunk/Tools/Scripts/webkitpy/port/driver.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 (234862 => 234863)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2018-08-14 21:15:16 UTC (rev 234862)
+++ trunk/Tools/ChangeLog       2018-08-14 22:43:39 UTC (rev 234863)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2018-08-14  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [webkitpy][Win] LayoutTests: test names should be Unix style, separated by slash not backslash
+        https://bugs.webkit.org/show_bug.cgi?id=187973
+
+        Reviewed by Alex Christensen.
+
+        In LayoutTests, test names have been canonicalized in Unix style
+        since Bug 63597, for example 'fast/css/001.html'. But Bug 179219,
+        Bug 179572, Bug 180660, and Bug 181814 have changed to use
+        os.path.seq instead of slash if Windows Python is used.
+
+        Revert parts of those changes. Change relative_test_filename to
+        return a slash-separated test name as chromium_win.py used to do.
+
+        This change fixes all 41 test-webkitpy failures in WinCairo port.
+
+        * Scripts/webkitpy/layout_tests/models/test_expectations.py:
+        (TestExpectationParser._parse_line): Do not convert test names with normpath.
+        * Scripts/webkitpy/port/base.py:
+        (Port.normalize_test_name): Use TEST_PATH_SEPARATOR instead of os.path.sep.
+        (Port.relative_test_filename): Replace self.host.filesystem.sep with self.TEST_PATH_SEPARATOR.
+        (Port.abspath_for_test): Replace self.TEST_PATH_SEPARATOR with self.host.filesystem.sep.
+        * Scripts/webkitpy/port/driver.py:
+        (Driver): Use '/' instead of os.sep.
+        * Scripts/webkitpy/port/win.py:
+        (WinCairoPort): Do not override TEST_PATH_SEPARATOR.
+
</ins><span class="cx"> 2018-08-14  Aakash Jain  <aakash_jain@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [ews-build] Add build step to run WK1 layout-test
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testsmodelstest_expectationspy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py (234862 => 234863)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py    2018-08-14 21:15:16 UTC (rev 234862)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py       2018-08-14 22:43:39 UTC (rev 234863)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx"> """
</span><span class="cx"> 
</span><span class="cx"> import logging
</span><del>-import os.path
</del><span class="cx"> import re
</span><span class="cx"> 
</span><span class="cx"> from webkitpy.layout_tests.models.test_configuration import TestConfigurationConverter
</span><span class="lines">@@ -139,12 +138,11 @@
</span><span class="cx">         if not self._check_test_exists(expectation_line):
</span><span class="cx">             return
</span><span class="cx"> 
</span><del>-        path = os.path.normpath(expectation_line.name)
-        expectation_line.is_file = self._port.test_isfile(path)
</del><ins>+        expectation_line.is_file = self._port.test_isfile(expectation_line.name)
</ins><span class="cx">         if expectation_line.is_file:
</span><del>-            expectation_line.path = path
</del><ins>+            expectation_line.path = expectation_line.name
</ins><span class="cx">         else:
</span><del>-            expectation_line.path = self._port.normalize_test_name(path)
</del><ins>+            expectation_line.path = self._port.normalize_test_name(expectation_line.name)
</ins><span class="cx"> 
</span><span class="cx">         self._collect_matching_tests(expectation_line)
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportbasepy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/base.py (234862 => 234863)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/base.py        2018-08-14 21:15:16 UTC (rev 234862)
+++ trunk/Tools/Scripts/webkitpy/port/base.py   2018-08-14 22:43:39 UTC (rev 234863)
</span><span class="lines">@@ -700,10 +700,10 @@
</span><span class="cx"> 
</span><span class="cx">     def normalize_test_name(self, test_name):
</span><span class="cx">         """Returns a normalized version of the test name or test directory."""
</span><del>-        if test_name.endswith(os.path.sep):
</del><ins>+        if test_name.endswith(self.TEST_PATH_SEPARATOR):
</ins><span class="cx">             return test_name
</span><span class="cx">         if self.test_isdir(test_name):
</span><del>-            return test_name + os.path.sep
</del><ins>+            return test_name + self.TEST_PATH_SEPARATOR
</ins><span class="cx">         return test_name
</span><span class="cx"> 
</span><span class="cx">     def driver_cmd_line_for_logging(self):
</span><span class="lines">@@ -830,7 +830,7 @@
</span><span class="cx">         # Ports that run on windows need to override this method to deal with
</span><span class="cx">         # filenames with backslashes in them.
</span><span class="cx">         if filename.startswith(self.layout_tests_dir()):
</span><del>-            return self.host.filesystem.relpath(filename, self.layout_tests_dir())
</del><ins>+            return self.host.filesystem.relpath(filename, self.layout_tests_dir()).replace(self.host.filesystem.sep, self.TEST_PATH_SEPARATOR)
</ins><span class="cx">         else:
</span><span class="cx">             return self.host.filesystem.abspath(filename)
</span><span class="cx"> 
</span><span class="lines">@@ -839,7 +839,7 @@
</span><span class="cx">         """Returns the full path to the file for a given test name. This is the
</span><span class="cx">         inverse of relative_test_filename() if no target_host is specified."""
</span><span class="cx">         host = target_host or self.host
</span><del>-        return host.filesystem.join(host.filesystem.map_base_host_path(self.layout_tests_dir()), test_name)
</del><ins>+        return host.filesystem.join(host.filesystem.map_base_host_path(self.layout_tests_dir()), test_name.replace(self.TEST_PATH_SEPARATOR, self.host.filesystem.sep))
</ins><span class="cx"> 
</span><span class="cx">     def jsc_results_directory(self):
</span><span class="cx">         return self._build_path()
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportdriverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/driver.py (234862 => 234863)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/driver.py      2018-08-14 21:15:16 UTC (rev 234862)
+++ trunk/Tools/Scripts/webkitpy/port/driver.py 2018-08-14 22:43:39 UTC (rev 234863)
</span><span class="lines">@@ -254,10 +254,10 @@
</span><span class="cx">             return shlex.split(self._port.get_option('wrapper')) + wrapper_arguments
</span><span class="cx">         return wrapper_arguments
</span><span class="cx"> 
</span><del>-    HTTP_DIR = normpath("http/tests") + os.sep
-    HTTP_LOCAL_DIR = normpath("http/tests/local") + os.sep
-    WEBKIT_SPECIFIC_WEB_PLATFORM_TEST_SUBDIR = normpath("http/wpt") + os.sep
-    WEBKIT_WEB_PLATFORM_TEST_SERVER_ROUTE = normpath("WebKit") + os.sep
</del><ins>+    HTTP_DIR = "http/tests/"
+    HTTP_LOCAL_DIR = "http/tests/local/"
+    WEBKIT_SPECIFIC_WEB_PLATFORM_TEST_SUBDIR = "http/wpt/"
+    WEBKIT_WEB_PLATFORM_TEST_SERVER_ROUTE = "WebKit/"
</ins><span class="cx"> 
</span><span class="cx">     def is_http_test(self, test_name):
</span><span class="cx">         return test_name.startswith(self.HTTP_DIR) and not test_name.startswith(self.HTTP_LOCAL_DIR)
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportwinpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/win.py (234862 => 234863)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/win.py 2018-08-14 21:15:16 UTC (rev 234862)
+++ trunk/Tools/Scripts/webkitpy/port/win.py    2018-08-14 22:43:39 UTC (rev 234863)
</span><span class="lines">@@ -475,8 +475,6 @@
</span><span class="cx"> 
</span><span class="cx">     DEFAULT_ARCHITECTURE = 'x86_64'
</span><span class="cx"> 
</span><del>-    TEST_PATH_SEPARATOR = os.sep
-
</del><span class="cx">     def default_baseline_search_path(self):
</span><span class="cx">         version_name_map = VersionNameMap.map(self.host.platform)
</span><span class="cx">         if self._os_version < self.VERSION_MIN or self._os_version > self.VERSION_MAX:
</span></span></pre>
</div>
</div>

</body>
</html>