Changeset 252058 in webkit

Timestamp:

Nov 5, 2019 9:25:57 AM (4 years ago)

Author:

Jonathan Bedard

Message:

webkitpy: Build ImageDiff if it is missing (Follow-fix)
​https://bugs.webkit.org/show_bug.cgi?id=183422

Unreviewed infrastructure fix.

• Scripts/webkitpy/port/base.py:

(Port._path_to_image_diff): Use the host build directory.

• Scripts/webkitpy/port/config.py:

(Config.build_directory): Allow the caller to ignore the port argument, which will return the default
build directory for the host running the script.

• Scripts/webkitpy/port/port_testcase.py:

(PortTestCase.make_port):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/port/base.py (modified) (1 diff)
• Scripts/webkitpy/port/config.py (modified) (2 diffs)
• Scripts/webkitpy/port/port_testcase.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2019-11-05  Jonathan Bedard  <jbedard@apple.com>
+
+        webkitpy: Build ImageDiff if it is missing (Follow-fix)
+        https://bugs.webkit.org/show_bug.cgi?id=183422
+
+        Unreviewed infrastructure fix.
+
+        * Scripts/webkitpy/port/base.py:
+        (Port._path_to_image_diff): Use the host build directory.
+        * Scripts/webkitpy/port/config.py:
+        (Config.build_directory): Allow the caller to ignore the port argument, which will return the default
+        build directory for the host running the script.
+        * Scripts/webkitpy/port/port_testcase.py:
+        (PortTestCase.make_port):
+
 2019-11-05  Chris Lord  <clord@igalia.com>
 

trunk/Tools/Scripts/webkitpy/port/base.py

@@ -1377 +1377 @@
         if self._filesystem.exists(default_image_diff):
             return default_image_diff
-        built_image_diff = self._filesystem.join(self._config.build_directory(self.get_option('configuration')), 'ImageDiff')
+        built_image_diff = self._filesystem.join(self._config.build_directory(self.get_option('configuration'), for_host=True), 'ImageDiff')
         _log.debug('ImageDiff not found at {}, using {} instead'.format(default_image_diff, built_image_diff))
         return built_image_diff

trunk/Tools/Scripts/webkitpy/port/config.py

@@ -80 +80 @@
         self._port_implementation = port_implementation
 
-    def build_directory(self, configuration):
+    def build_directory(self, configuration, for_host=False):
         """Returns the path to the build directory for the configuration."""
         if configuration:
@@ -88 +88 @@
             flags = []
 
-        if self._port_implementation:
+        if self._port_implementation and not for_host:
             flags.append('--' + self._port_implementation)
 

trunk/Tools/Scripts/webkitpy/port/port_testcase.py

@@ -121 +121 @@
         port_name = self.port_maker.determine_full_port_name(host, options, port_name)
         port = self.port_maker(host, port_name, options=options, **kwargs)
-        port._config.build_directory = lambda configuration: '/mock-build'
+        port._config.build_directory = lambda configuration, for_host=False: '/mock-build'
         return port