Title: [224656] trunk/Tools
- Revision
- 224656
- Author
- commit-qu...@webkit.org
- Date
- 2017-11-09 16:48:51 -0800 (Thu, 09 Nov 2017)
Log Message
[WinCairo] Cannot find ImageDiff executable
https://bugs.webkit.org/show_bug.cgi?id=179508
Patch by Basuke Suzuki <basuke.suz...@sony.com> on 2017-11-09
Reviewed by Per Arne Vollan.
* Scripts/webkitpy/port/win.py:
(WinPort.is_cygwin):
(WinPort._path_to_image_diff):
(WinPort.find_system_pid):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (224655 => 224656)
--- trunk/Tools/ChangeLog 2017-11-10 00:41:27 UTC (rev 224655)
+++ trunk/Tools/ChangeLog 2017-11-10 00:48:51 UTC (rev 224656)
@@ -1,3 +1,15 @@
+2017-11-09 Basuke Suzuki <basuke.suz...@sony.com>
+
+ [WinCairo] Cannot find ImageDiff executable
+ https://bugs.webkit.org/show_bug.cgi?id=179508
+
+ Reviewed by Per Arne Vollan.
+
+ * Scripts/webkitpy/port/win.py:
+ (WinPort.is_cygwin):
+ (WinPort._path_to_image_diff):
+ (WinPort.find_system_pid):
+
2017-11-09 Fujii Hironori <hironori.fu...@sony.com>
[WinCairo EWS] svn-apply: 'cp' is not recognized as an internal or external command
Modified: trunk/Tools/Scripts/webkitpy/port/win.py (224655 => 224656)
--- trunk/Tools/Scripts/webkitpy/port/win.py 2017-11-10 00:41:27 UTC (rev 224655)
+++ trunk/Tools/Scripts/webkitpy/port/win.py 2017-11-10 00:48:51 UTC (rev 224656)
@@ -161,6 +161,10 @@
return self._filesystem.join(root_directory, *comps)
+ def is_cygwin(self):
+ """Return whether current platform is Cygwin or not"""
+ return self.host.platform.is_cygwin()
+
# Note: These are based on the stock XAMPP locations for these files.
def _uses_apache(self):
return True
@@ -181,6 +185,12 @@
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()
+
+ return self._build_path('ImageDiff.exe')
+
def test_search_path(self):
test_fallback_names = [path for path in self.baseline_search_path() if not path.startswith(self._webkit_baseline_path('mac'))]
return map(self._webkit_baseline_path, test_fallback_names)
@@ -424,7 +434,7 @@
def find_system_pid(self, name, pid):
system_pid = int(pid)
- if sys.platform == "cygwin":
+ if self.is_cygwin():
# Windows and Cygwin PIDs are not the same. We need to find the Windows
# PID for our Cygwin process so we can match it later to any crash
# files we end up creating (which will be tagged with the Windows PID)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
