Title: [252087] trunk/Tools
Revision
252087
Author
jbed...@apple.com
Date
2019-11-05 14:59:56 -0800 (Tue, 05 Nov 2019)

Log Message

REGRESSION(r252031): layout tests fail to run in non apple ports after r252031 (Follow-up fix)
https://bugs.webkit.org/show_bug.cgi?id=203844

Rubber-stamped by Aakash Jain.

Remove infinite loop for Windows.

* Scripts/webkitpy/port/win.py:
(WinPort._path_to_default_image_diff):
(WinPort._path_to_image_diff): Deleted.

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (252086 => 252087)


--- trunk/Tools/ChangeLog	2019-11-05 22:57:46 UTC (rev 252086)
+++ trunk/Tools/ChangeLog	2019-11-05 22:59:56 UTC (rev 252087)
@@ -1,3 +1,16 @@
+2019-11-05  Jonathan Bedard  <jbed...@apple.com>
+
+        REGRESSION(r252031): layout tests fail to run in non apple ports after r252031 (Follow-up fix)
+        https://bugs.webkit.org/show_bug.cgi?id=203844
+
+        Rubber-stamped by Aakash Jain.
+
+        Remove infinite loop for Windows.
+
+        * Scripts/webkitpy/port/win.py:
+        (WinPort._path_to_default_image_diff):
+        (WinPort._path_to_image_diff): Deleted.
+
 2019-11-05  Aakash Jain  <aakash_j...@apple.com>
 
         EWS should report test failures from clean-tree to results.webkit.org

Modified: trunk/Tools/Scripts/webkitpy/port/win.py (252086 => 252087)


--- trunk/Tools/Scripts/webkitpy/port/win.py	2019-11-05 22:57:46 UTC (rev 252086)
+++ trunk/Tools/Scripts/webkitpy/port/win.py	2019-11-05 22:59:56 UTC (rev 252087)
@@ -192,15 +192,9 @@
     def _path_to_lighttpd_php(self):
         return "/usr/bin/php-cgi"
 
-    def _path_to_image_diff(self):
-        if self.is_cygwin():
-            return super(WinPort, self)._path_to_image_diff()
-
+    def _path_to_default_image_diff(self):
         return self._build_path('ImageDiff.exe')
 
-    def _path_to_default_image_diff(self):
-        return self._path_to_image_diff()
-
     API_TEST_BINARY_NAMES = ['TestWTF.exe', 'TestWebCore.exe', 'TestWebKitLegacy.exe']
 
     def path_to_api_test_binaries(self):
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to