Title: [252669] branches/safari-608-branch/Tools
- Revision
- 252669
- Author
- [email protected]
- Date
- 2019-11-19 17:37:25 -0800 (Tue, 19 Nov 2019)
Log Message
Cherry-pick r252031. rdar://problem/56889868
webkitpy: Build ImageDiff if it is missing
https://bugs.webkit.org/show_bug.cgi?id=183422
Reviewed by Alexey Proskuryakov.
ImageDiff is built with a different SDK than the rest of the WebKit
stack, and this frequently causes infrastructure failures where ImageDiff
is missing on testers. To address this, we should automatically build
ImageDiff if it is missing.
* Scripts/webkitpy/port/base.py:
(Port.check_build): Unconditionally build ImageDiff if it is missing.
(Port.check_image_diff): Use _build_path since _path_to_image_diff will
attempt to use a back-up location.
(Port._path_to_image_diff): If the provided path to ImageDiff does not
exist, use the path of the one we built.
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@252031 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-608-branch/Tools/ChangeLog (252668 => 252669)
--- branches/safari-608-branch/Tools/ChangeLog 2019-11-20 01:35:20 UTC (rev 252668)
+++ branches/safari-608-branch/Tools/ChangeLog 2019-11-20 01:37:25 UTC (rev 252669)
@@ -1,5 +1,47 @@
2019-11-19 Alan Coon <[email protected]>
+ Cherry-pick r252031. rdar://problem/56889868
+
+ webkitpy: Build ImageDiff if it is missing
+ https://bugs.webkit.org/show_bug.cgi?id=183422
+
+ Reviewed by Alexey Proskuryakov.
+
+ ImageDiff is built with a different SDK than the rest of the WebKit
+ stack, and this frequently causes infrastructure failures where ImageDiff
+ is missing on testers. To address this, we should automatically build
+ ImageDiff if it is missing.
+
+ * Scripts/webkitpy/port/base.py:
+ (Port.check_build): Unconditionally build ImageDiff if it is missing.
+ (Port.check_image_diff): Use _build_path since _path_to_image_diff will
+ attempt to use a back-up location.
+ (Port._path_to_image_diff): If the provided path to ImageDiff does not
+ exist, use the path of the one we built.
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@252031 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-11-04 Jonathan Bedard <[email protected]>
+
+ webkitpy: Build ImageDiff if it is missing
+ https://bugs.webkit.org/show_bug.cgi?id=183422
+
+ Reviewed by Alexey Proskuryakov.
+
+ ImageDiff is built with a different SDK than the rest of the WebKit
+ stack, and this frequently causes infrastructure failures where ImageDiff
+ is missing on testers. To address this, we should automatically build
+ ImageDiff if it is missing.
+
+ * Scripts/webkitpy/port/base.py:
+ (Port.check_build): Unconditionally build ImageDiff if it is missing.
+ (Port.check_image_diff): Use _build_path since _path_to_image_diff will
+ attempt to use a back-up location.
+ (Port._path_to_image_diff): If the provided path to ImageDiff does not
+ exist, use the path of the one we built.
+
+2019-11-19 Alan Coon <[email protected]>
+
Cherry-pick r250997. rdar://problem/56177210
results.webkit.org: Sort out certificates on Catalina
Modified: branches/safari-608-branch/Tools/Scripts/webkitpy/port/base.py (252668 => 252669)
--- branches/safari-608-branch/Tools/Scripts/webkitpy/port/base.py 2019-11-20 01:35:20 UTC (rev 252668)
+++ branches/safari-608-branch/Tools/Scripts/webkitpy/port/base.py 2019-11-20 01:37:25 UTC (rev 252669)
@@ -243,10 +243,7 @@
if self.get_option('install') and not self._check_port_build():
return False
if not self.check_image_diff():
- if self.get_option('build'):
- return self._build_image_diff()
- else:
- return False
+ return self._build_image_diff()
return True
def check_api_test_build(self, canonicalized_binaries=None):
@@ -295,7 +292,7 @@
def check_image_diff(self, override_step=None, logging=True):
"""This routine is used to check whether image_diff binary exists."""
- image_diff_path = self._path_to_image_diff()
+ image_diff_path = self._build_path('ImageDiff')
if not self._filesystem.exists(image_diff_path):
if logging:
_log.error("ImageDiff was not found at %s" % image_diff_path)
@@ -1381,6 +1378,7 @@
This is likely only used by start/stop_helper()."""
return None
+ @memoized
def _path_to_image_diff(self):
"""Returns the full path to the image_diff binary, or None if it is not available.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
