Title: [252664] branches/safari-608-branch/Tools
- Revision
- 252664
- Author
- [email protected]
- Date
- 2019-11-19 17:24:47 -0800 (Tue, 19 Nov 2019)
Log Message
Cherry-pick r252087. rdar://problem/56900657
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.
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@252087 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-608-branch/Tools/ChangeLog (252663 => 252664)
--- branches/safari-608-branch/Tools/ChangeLog 2019-11-20 01:24:45 UTC (rev 252663)
+++ branches/safari-608-branch/Tools/ChangeLog 2019-11-20 01:24:47 UTC (rev 252664)
@@ -1,5 +1,35 @@
2019-11-19 Alan Coon <[email protected]>
+ Cherry-pick r252087. rdar://problem/56900657
+
+ 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.
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@252087 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-11-05 Jonathan Bedard <[email protected]>
+
+ 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-19 Alan Coon <[email protected]>
+
Cherry-pick r252058. rdar://problem/56889868
webkitpy: Build ImageDiff if it is missing (Follow-fix)
Modified: branches/safari-608-branch/Tools/Scripts/webkitpy/port/win.py (252663 => 252664)
--- branches/safari-608-branch/Tools/Scripts/webkitpy/port/win.py 2019-11-20 01:24:45 UTC (rev 252663)
+++ branches/safari-608-branch/Tools/Scripts/webkitpy/port/win.py 2019-11-20 01:24:47 UTC (rev 252664)
@@ -192,10 +192,7 @@
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')
API_TEST_BINARY_NAMES = ['TestWTF.exe', 'TestWebCore.exe', 'TestWebKitLegacy.exe']
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
