Title: [289067] trunk/Tools
Revision
289067
Author
hironori.fu...@sony.com
Date
2022-02-03 12:15:15 -0800 (Thu, 03 Feb 2022)

Log Message

REGRESSION(r288878) webkitpy.layout_tests.controllers.layout_test_finder_legacy_unittest.LayoutTestFinderTests tests are failing with Windows Python
https://bugs.webkit.org/show_bug.cgi?id=236043

Reviewed by Jonathan Bedard.

* Scripts/webkitpy/port/base.py:
(Port.relative_test_filename): Normalize filename with
TEST_PATH_SEPARATOR before comparing with layout_tests_dir().

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (289066 => 289067)


--- trunk/Tools/ChangeLog	2022-02-03 19:59:26 UTC (rev 289066)
+++ trunk/Tools/ChangeLog	2022-02-03 20:15:15 UTC (rev 289067)
@@ -1,3 +1,14 @@
+2022-02-03  Fujii Hironori  <hironori.fu...@sony.com>
+
+        REGRESSION(r288878) webkitpy.layout_tests.controllers.layout_test_finder_legacy_unittest.LayoutTestFinderTests tests are failing with Windows Python
+        https://bugs.webkit.org/show_bug.cgi?id=236043
+
+        Reviewed by Jonathan Bedard.
+
+        * Scripts/webkitpy/port/base.py:
+        (Port.relative_test_filename): Normalize filename with
+        TEST_PATH_SEPARATOR before comparing with layout_tests_dir().
+
 2022-02-03  J Pascoe  <j_pas...@apple.com>
 
         [WebAuthn] Allow use of hardware-fixed credentials while using alternate store

Modified: trunk/Tools/Scripts/webkitpy/port/base.py (289066 => 289067)


--- trunk/Tools/Scripts/webkitpy/port/base.py	2022-02-03 19:59:26 UTC (rev 289066)
+++ trunk/Tools/Scripts/webkitpy/port/base.py	2022-02-03 20:15:15 UTC (rev 289067)
@@ -718,8 +718,7 @@
     def relative_test_filename(self, filename):
         """Returns a test_name a relative unix-style path for a filename under the LayoutTests
         directory. Ports may legitimately return abspaths here if no relpath makes sense."""
-        # Ports that run on windows need to override this method to deal with
-        # filenames with backslashes in them.
+        filename = filename.replace(self.host.filesystem.sep, self.TEST_PATH_SEPARATOR)
         if filename.startswith(self.layout_tests_dir()):
             return self.host.filesystem.relpath(filename, self.layout_tests_dir()).replace(self.host.filesystem.sep, self.TEST_PATH_SEPARATOR)
         else:
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to