Diff
Modified: branches/safari-607-branch/Tools/ChangeLog (243768 => 243769)
--- branches/safari-607-branch/Tools/ChangeLog 2019-04-02 23:33:00 UTC (rev 243768)
+++ branches/safari-607-branch/Tools/ChangeLog 2019-04-03 00:03:56 UTC (rev 243769)
@@ -1,5 +1,72 @@
2019-04-02 Kocsen Chung <[email protected]>
+ Cherry-pick r239875. rdar://problem/49539128
+
+ webkitpy: Incorporate device type into baseline search path
+ https://bugs.webkit.org/show_bug.cgi?id=193356
+ <rdar://problem/47215515>
+
+ Reviewed by Lucas Forschler.
+
+ We need a way to include device type in the baseline search path for iOS to support device specific test expectations.
+
+ * Scripts/webkitpy/port/base.py:
+ (Port.default_baseline_search_path): Allow device type to be passed in.
+ * Scripts/webkitpy/port/gtk.py:
+ (GtkPort.default_baseline_search_path): Ignore device type.
+ * Scripts/webkitpy/port/ios.py:
+ (IOSPort.default_baseline_search_path): Optionally allow device type to be incorporated into the baseline search path.
+ (IOSPort.test_expectations_file_position): Update index for the additional device-type specific baseline search path.
+ * Scripts/webkitpy/port/ios_device_unittest.py:
+ (IOSDeviceTest):
+ * Scripts/webkitpy/port/ios_simulator_unittest.py:
+ (IOSSimulatorTest):
+ * Scripts/webkitpy/port/mac.py:
+ (MacPort.default_baseline_search_path): Ignore device type.
+ * Scripts/webkitpy/port/watch.py:
+ (WatchPort.default_baseline_search_path): Ditto.
+ * Scripts/webkitpy/port/win.py:
+ (WinPort.default_baseline_search_path): Ditto.
+ (WinCairoPort.default_baseline_search_path): Ditto.
+ * Scripts/webkitpy/port/wpe.py:
+ (WPEPort.default_baseline_search_path): Ditto.
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@239875 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-01-11 Jonathan Bedard <[email protected]>
+
+ webkitpy: Incorporate device type into baseline search path
+ https://bugs.webkit.org/show_bug.cgi?id=193356
+ <rdar://problem/47215515>
+
+ Reviewed by Lucas Forschler.
+
+ We need a way to include device type in the baseline search path for iOS to support device specific test expectations.
+
+ * Scripts/webkitpy/port/base.py:
+ (Port.default_baseline_search_path): Allow device type to be passed in.
+ * Scripts/webkitpy/port/gtk.py:
+ (GtkPort.default_baseline_search_path): Ignore device type.
+ * Scripts/webkitpy/port/ios.py:
+ (IOSPort.default_baseline_search_path): Optionally allow device type to be incorporated into the baseline search path.
+ (IOSPort.test_expectations_file_position): Update index for the additional device-type specific baseline search path.
+ * Scripts/webkitpy/port/ios_device_unittest.py:
+ (IOSDeviceTest):
+ * Scripts/webkitpy/port/ios_simulator_unittest.py:
+ (IOSSimulatorTest):
+ * Scripts/webkitpy/port/mac.py:
+ (MacPort.default_baseline_search_path): Ignore device type.
+ * Scripts/webkitpy/port/watch.py:
+ (WatchPort.default_baseline_search_path): Ditto.
+ * Scripts/webkitpy/port/win.py:
+ (WinPort.default_baseline_search_path): Ditto.
+ (WinCairoPort.default_baseline_search_path): Ditto.
+ * Scripts/webkitpy/port/wpe.py:
+ (WPEPort.default_baseline_search_path): Ditto.
+
+2019-04-02 Kocsen Chung <[email protected]>
+
Cherry-pick r243732. rdar://problem/49356714
run-api-tests: Upload test results
Modified: branches/safari-607-branch/Tools/Scripts/webkitpy/port/base.py (243768 => 243769)
--- branches/safari-607-branch/Tools/Scripts/webkitpy/port/base.py 2019-04-02 23:33:00 UTC (rev 243768)
+++ branches/safari-607-branch/Tools/Scripts/webkitpy/port/base.py 2019-04-03 00:03:56 UTC (rev 243769)
@@ -213,7 +213,7 @@
def baseline_search_path(self):
return self.get_option('additional_platform_directory', []) + self._compare_baseline() + self.default_baseline_search_path()
- def default_baseline_search_path(self):
+ def default_baseline_search_path(self, device_type=None):
"""Return a list of absolute paths to directories to search under for
baselines. The directories are searched in order."""
search_paths = []
Modified: branches/safari-607-branch/Tools/Scripts/webkitpy/port/gtk.py (243768 => 243769)
--- branches/safari-607-branch/Tools/Scripts/webkitpy/port/gtk.py 2019-04-02 23:33:00 UTC (rev 243768)
+++ branches/safari-607-branch/Tools/Scripts/webkitpy/port/gtk.py 2019-04-03 00:03:56 UTC (rev 243769)
@@ -210,7 +210,7 @@
search_paths.extend(self.get_option("additional_platform_directory", []))
return search_paths
- def default_baseline_search_path(self):
+ def default_baseline_search_path(self, **kwargs):
return map(self._webkit_baseline_path, self._search_paths())
def _port_specific_expectations_files(self):
Modified: branches/safari-607-branch/Tools/Scripts/webkitpy/port/ios.py (243768 => 243769)
--- branches/safari-607-branch/Tools/Scripts/webkitpy/port/ios.py 2019-04-02 23:33:00 UTC (rev 243768)
+++ branches/safari-607-branch/Tools/Scripts/webkitpy/port/ios.py 2019-04-03 00:03:56 UTC (rev 243769)
@@ -53,7 +53,7 @@
return VersionNameMap.map(self.host.platform).to_name(self._os_version, platform=IOSPort.port_name)
@memoized
- def default_baseline_search_path(self):
+ def default_baseline_search_path(self, device_type=None):
wk_string = 'wk1'
if self.get_option('webkit_test_runner'):
wk_string = 'wk2'
@@ -70,41 +70,43 @@
else:
temp_version.major -= 1
+ runtime_type = 'simulator' if 'simulator' in self.SDK else 'device'
+ hardware_family = device_type.hardware_family.lower() if device_type and device_type.hardware_family else None
+ hardware_type = device_type.hardware_type.lower() if device_type and device_type.hardware_type else None
+
+ base_variants = []
+ if hardware_family and hardware_type:
+ base_variants.append('{}-{}-{}'.format(hardware_family, hardware_type, runtime_type))
+ if hardware_family:
+ base_variants.append('{}-{}'.format(hardware_family, runtime_type))
+ base_variants.append('{}-{}'.format(IOSPort.port_name, runtime_type))
+ if hardware_family and hardware_type:
+ base_variants.append('{}-{}'.format(hardware_family, hardware_type))
+ if hardware_family:
+ base_variants.append(hardware_family)
+ base_variants.append(IOSPort.port_name)
+
expectations = []
- for version in versions_to_fallback:
- apple_name = None
- if apple_additions():
- apple_name = VersionNameMap.map(self.host.platform).to_name(version, platform=IOSPort.port_name, table=INTERNAL_TABLE)
+ for variant in base_variants:
+ for version in versions_to_fallback:
+ apple_name = None
+ if apple_additions():
+ apple_name = VersionNameMap.map(self.host.platform).to_name(version, platform=IOSPort.port_name, table=INTERNAL_TABLE)
- if apple_name:
- expectations.append(self._apple_baseline_path('{}-{}-{}'.format(self.port_name, apple_name.lower().replace(' ', ''), wk_string)))
- expectations.append(self._webkit_baseline_path('{}-{}-{}'.format(self.port_name, version.major, wk_string)))
- if apple_name:
- expectations.append(self._apple_baseline_path('{}-{}'.format(self.port_name, apple_name.lower().replace(' ', ''))))
- expectations.append(self._webkit_baseline_path('{}-{}'.format(self.port_name, version.major)))
+ if apple_name:
+ expectations.append(self._apple_baseline_path('{}-{}-{}'.format(variant, apple_name.lower().replace(' ', ''), wk_string)))
+ expectations.append(self._webkit_baseline_path('{}-{}-{}'.format(variant, version.major, wk_string)))
+ if apple_name:
+ expectations.append(self._apple_baseline_path('{}-{}'.format(variant, apple_name.lower().replace(' ', ''))))
+ expectations.append(self._webkit_baseline_path('{}-{}'.format(variant, version.major)))
- if apple_additions():
- expectations.append(self._apple_baseline_path('{}-{}'.format(self.port_name, wk_string)))
- expectations.append(self._webkit_baseline_path('{}-{}'.format(self.port_name, wk_string)))
- if apple_additions():
- expectations.append(self._apple_baseline_path(self.port_name))
- expectations.append(self._webkit_baseline_path(self.port_name))
-
- for version in versions_to_fallback:
- apple_name = None
if apple_additions():
- apple_name = VersionNameMap.map(self.host.platform).to_name(version, platform=IOSPort.port_name, table=INTERNAL_TABLE)
- if apple_name:
- expectations.append(self._apple_baseline_path('{}-{}'.format(IOSPort.port_name, apple_name.lower().replace(' ', ''))))
- expectations.append(self._webkit_baseline_path('{}-{}'.format(IOSPort.port_name, version.major)))
+ expectations.append(self._apple_baseline_path('{}-{}'.format(variant, wk_string)))
+ expectations.append(self._webkit_baseline_path('{}-{}'.format(variant, wk_string)))
+ if apple_additions():
+ expectations.append(self._apple_baseline_path(variant))
+ expectations.append(self._webkit_baseline_path(variant))
- if apple_additions():
- expectations.append(self._apple_baseline_path('{}-{}'.format(IOSPort.port_name, wk_string)))
- expectations.append(self._webkit_baseline_path('{}-{}'.format(IOSPort.port_name, wk_string)))
- if apple_additions():
- expectations.append(self._apple_baseline_path(IOSPort.port_name))
- expectations.append(self._webkit_baseline_path(IOSPort.port_name))
-
if self.get_option('webkit_test_runner'):
expectations.append(self._webkit_baseline_path('wk2'))
@@ -111,4 +113,4 @@
return expectations
def test_expectations_file_position(self):
- return 4
+ return 5
Modified: branches/safari-607-branch/Tools/Scripts/webkitpy/port/ios_device_unittest.py (243768 => 243769)
--- branches/safari-607-branch/Tools/Scripts/webkitpy/port/ios_device_unittest.py 2019-04-02 23:33:00 UTC (rev 243768)
+++ branches/safari-607-branch/Tools/Scripts/webkitpy/port/ios_device_unittest.py 2019-04-03 00:03:56 UTC (rev 243769)
@@ -28,6 +28,7 @@
from webkitpy.port.ios_device import IOSDevicePort
from webkitpy.port import ios_testcase
from webkitpy.port import port_testcase
+from webkitpy.xcode.device_type import DeviceType
class IOSDeviceTest(ios_testcase.IOSTest):
@@ -88,30 +89,71 @@
def test_layout_test_searchpath_with_apple_additions(self):
with port_testcase.bind_mock_apple_additions():
search_path = self.make_port().default_baseline_search_path()
- self.assertEqual(search_path[0], '/additional_testing_path/ios-device-add-ios11-wk1')
- self.assertEqual(search_path[1], '/mock-checkout/LayoutTests/platform/ios-device-11-wk1')
- self.assertEqual(search_path[2], '/additional_testing_path/ios-device-add-ios11')
- self.assertEqual(search_path[3], '/mock-checkout/LayoutTests/platform/ios-device-11')
- self.assertEqual(search_path[4], '/additional_testing_path/ios-device-wk1')
- self.assertEqual(search_path[5], '/mock-checkout/LayoutTests/platform/ios-device-wk1')
- self.assertEqual(search_path[6], '/additional_testing_path/ios-device')
- self.assertEqual(search_path[7], '/mock-checkout/LayoutTests/platform/ios-device')
- self.assertEqual(search_path[8], '/additional_testing_path/ios-add-ios11')
- self.assertEqual(search_path[9], '/mock-checkout/LayoutTests/platform/ios-11')
- self.assertEqual(search_path[10], '/additional_testing_path/ios-wk1')
- self.assertEqual(search_path[11], '/mock-checkout/LayoutTests/platform/ios-wk1')
+ self.assertEqual(search_path, [
+ '/additional_testing_path/ios-device-add-ios11-wk1',
+ '/mock-checkout/LayoutTests/platform/ios-device-11-wk1',
+ '/additional_testing_path/ios-device-add-ios11',
+ '/mock-checkout/LayoutTests/platform/ios-device-11',
+ '/additional_testing_path/ios-device-wk1',
+ '/mock-checkout/LayoutTests/platform/ios-device-wk1',
+ '/additional_testing_path/ios-device',
+ '/mock-checkout/LayoutTests/platform/ios-device',
+ '/additional_testing_path/ios-add-ios11-wk1',
+ '/mock-checkout/LayoutTests/platform/ios-11-wk1',
+ '/additional_testing_path/ios-add-ios11',
+ '/mock-checkout/LayoutTests/platform/ios-11',
+ '/additional_testing_path/ios-wk1',
+ '/mock-checkout/LayoutTests/platform/ios-wk1',
+ '/additional_testing_path/ios',
+ '/mock-checkout/LayoutTests/platform/ios',
+ ])
+
def test_layout_test_searchpath_without_apple_additions(self):
search_path = self.make_port(port_name='ios-device-wk2', os_version=Version(12)).default_baseline_search_path()
- self.assertEqual(search_path[0], '/mock-checkout/LayoutTests/platform/ios-device-12-wk2')
- self.assertEqual(search_path[1], '/mock-checkout/LayoutTests/platform/ios-device-12')
- self.assertEqual(search_path[2], '/mock-checkout/LayoutTests/platform/ios-device-wk2')
- self.assertEqual(search_path[3], '/mock-checkout/LayoutTests/platform/ios-device')
- self.assertEqual(search_path[4], '/mock-checkout/LayoutTests/platform/ios-12')
- self.assertEqual(search_path[5], '/mock-checkout/LayoutTests/platform/ios-wk2')
- self.assertEqual(search_path[6], '/mock-checkout/LayoutTests/platform/ios')
- self.assertEqual(search_path[7], '/mock-checkout/LayoutTests/platform/wk2')
+ self.assertEqual(search_path, [
+ '/mock-checkout/LayoutTests/platform/ios-device-12-wk2',
+ '/mock-checkout/LayoutTests/platform/ios-device-12',
+ '/mock-checkout/LayoutTests/platform/ios-device-wk2',
+ '/mock-checkout/LayoutTests/platform/ios-device',
+ '/mock-checkout/LayoutTests/platform/ios-12-wk2',
+ '/mock-checkout/LayoutTests/platform/ios-12',
+ '/mock-checkout/LayoutTests/platform/ios-wk2',
+ '/mock-checkout/LayoutTests/platform/ios',
+ '/mock-checkout/LayoutTests/platform/wk2',
+ ])
+ def test_layout_searchpath_wih_device_type(self):
+ search_path = self.make_port(port_name='ios-device-wk2', os_version=Version(12)).default_baseline_search_path(DeviceType.from_string('iPhone SE'))
+
+ self.assertEqual(search_path, [
+ '/mock-checkout/LayoutTests/platform/iphone-se-device-12-wk2',
+ '/mock-checkout/LayoutTests/platform/iphone-se-device-12',
+ '/mock-checkout/LayoutTests/platform/iphone-se-device-wk2',
+ '/mock-checkout/LayoutTests/platform/iphone-se-device',
+ '/mock-checkout/LayoutTests/platform/iphone-device-12-wk2',
+ '/mock-checkout/LayoutTests/platform/iphone-device-12',
+ '/mock-checkout/LayoutTests/platform/iphone-device-wk2',
+ '/mock-checkout/LayoutTests/platform/iphone-device',
+ '/mock-checkout/LayoutTests/platform/ios-device-12-wk2',
+ '/mock-checkout/LayoutTests/platform/ios-device-12',
+ '/mock-checkout/LayoutTests/platform/ios-device-wk2',
+ '/mock-checkout/LayoutTests/platform/ios-device',
+ '/mock-checkout/LayoutTests/platform/iphone-se-12-wk2',
+ '/mock-checkout/LayoutTests/platform/iphone-se-12',
+ '/mock-checkout/LayoutTests/platform/iphone-se-wk2',
+ '/mock-checkout/LayoutTests/platform/iphone-se',
+ '/mock-checkout/LayoutTests/platform/iphone-12-wk2',
+ '/mock-checkout/LayoutTests/platform/iphone-12',
+ '/mock-checkout/LayoutTests/platform/iphone-wk2',
+ '/mock-checkout/LayoutTests/platform/iphone',
+ '/mock-checkout/LayoutTests/platform/ios-12-wk2',
+ '/mock-checkout/LayoutTests/platform/ios-12',
+ '/mock-checkout/LayoutTests/platform/ios-wk2',
+ '/mock-checkout/LayoutTests/platform/ios',
+ '/mock-checkout/LayoutTests/platform/wk2',
+ ])
+
def test_max_child_processes(self):
pass
Modified: branches/safari-607-branch/Tools/Scripts/webkitpy/port/ios_simulator_unittest.py (243768 => 243769)
--- branches/safari-607-branch/Tools/Scripts/webkitpy/port/ios_simulator_unittest.py 2019-04-02 23:33:00 UTC (rev 243768)
+++ branches/safari-607-branch/Tools/Scripts/webkitpy/port/ios_simulator_unittest.py 2019-04-03 00:03:56 UTC (rev 243769)
@@ -92,31 +92,72 @@
def test_layout_test_searchpath_with_apple_additions(self):
with port_testcase.bind_mock_apple_additions():
search_path = self.make_port().default_baseline_search_path()
- self.assertEqual(search_path[0], '/additional_testing_path/ios-simulator-add-ios11-wk1')
- self.assertEqual(search_path[1], '/mock-checkout/LayoutTests/platform/ios-simulator-11-wk1')
- self.assertEqual(search_path[2], '/additional_testing_path/ios-simulator-add-ios11')
- self.assertEqual(search_path[3], '/mock-checkout/LayoutTests/platform/ios-simulator-11')
- self.assertEqual(search_path[4], '/additional_testing_path/ios-simulator-wk1')
- self.assertEqual(search_path[5], '/mock-checkout/LayoutTests/platform/ios-simulator-wk1')
- self.assertEqual(search_path[6], '/additional_testing_path/ios-simulator')
- self.assertEqual(search_path[7], '/mock-checkout/LayoutTests/platform/ios-simulator')
- self.assertEqual(search_path[8], '/additional_testing_path/ios-add-ios11')
- self.assertEqual(search_path[9], '/mock-checkout/LayoutTests/platform/ios-11')
- self.assertEqual(search_path[10], '/additional_testing_path/ios-wk1')
- self.assertEqual(search_path[11], '/mock-checkout/LayoutTests/platform/ios-wk1')
+ self.assertEqual(search_path, [
+ '/additional_testing_path/ios-simulator-add-ios11-wk1',
+ '/mock-checkout/LayoutTests/platform/ios-simulator-11-wk1',
+ '/additional_testing_path/ios-simulator-add-ios11',
+ '/mock-checkout/LayoutTests/platform/ios-simulator-11',
+ '/additional_testing_path/ios-simulator-wk1',
+ '/mock-checkout/LayoutTests/platform/ios-simulator-wk1',
+ '/additional_testing_path/ios-simulator',
+ '/mock-checkout/LayoutTests/platform/ios-simulator',
+ '/additional_testing_path/ios-add-ios11-wk1',
+ '/mock-checkout/LayoutTests/platform/ios-11-wk1',
+ '/additional_testing_path/ios-add-ios11',
+ '/mock-checkout/LayoutTests/platform/ios-11',
+ '/additional_testing_path/ios-wk1',
+ '/mock-checkout/LayoutTests/platform/ios-wk1',
+ '/additional_testing_path/ios',
+ '/mock-checkout/LayoutTests/platform/ios',
+ ])
+
def test_layout_test_searchpath_without_apple_additions(self):
search_path = self.make_port(port_name='ios-simulator-wk2', os_version=Version(12)).default_baseline_search_path()
- self.assertEqual(search_path[0], '/mock-checkout/LayoutTests/platform/ios-simulator-12-wk2')
- self.assertEqual(search_path[1], '/mock-checkout/LayoutTests/platform/ios-simulator-12')
- self.assertEqual(search_path[2], '/mock-checkout/LayoutTests/platform/ios-simulator-wk2')
- self.assertEqual(search_path[3], '/mock-checkout/LayoutTests/platform/ios-simulator')
- self.assertEqual(search_path[4], '/mock-checkout/LayoutTests/platform/ios-12')
- self.assertEqual(search_path[5], '/mock-checkout/LayoutTests/platform/ios-wk2')
- self.assertEqual(search_path[6], '/mock-checkout/LayoutTests/platform/ios')
- self.assertEqual(search_path[7], '/mock-checkout/LayoutTests/platform/wk2')
+ self.assertEqual(search_path, [
+ '/mock-checkout/LayoutTests/platform/ios-simulator-12-wk2',
+ '/mock-checkout/LayoutTests/platform/ios-simulator-12',
+ '/mock-checkout/LayoutTests/platform/ios-simulator-wk2',
+ '/mock-checkout/LayoutTests/platform/ios-simulator',
+ '/mock-checkout/LayoutTests/platform/ios-12-wk2',
+ '/mock-checkout/LayoutTests/platform/ios-12',
+ '/mock-checkout/LayoutTests/platform/ios-wk2',
+ '/mock-checkout/LayoutTests/platform/ios',
+ '/mock-checkout/LayoutTests/platform/wk2',
+ ])
+ def test_layout_searchpath_wih_device_type(self):
+ search_path = self.make_port(port_name='ios-simulator-wk2', os_version=Version(12)).default_baseline_search_path(DeviceType.from_string('iPhone SE'))
+
+ self.assertEqual(search_path, [
+ '/mock-checkout/LayoutTests/platform/iphone-se-simulator-12-wk2',
+ '/mock-checkout/LayoutTests/platform/iphone-se-simulator-12',
+ '/mock-checkout/LayoutTests/platform/iphone-se-simulator-wk2',
+ '/mock-checkout/LayoutTests/platform/iphone-se-simulator',
+ '/mock-checkout/LayoutTests/platform/iphone-simulator-12-wk2',
+ '/mock-checkout/LayoutTests/platform/iphone-simulator-12',
+ '/mock-checkout/LayoutTests/platform/iphone-simulator-wk2',
+ '/mock-checkout/LayoutTests/platform/iphone-simulator',
+ '/mock-checkout/LayoutTests/platform/ios-simulator-12-wk2',
+ '/mock-checkout/LayoutTests/platform/ios-simulator-12',
+ '/mock-checkout/LayoutTests/platform/ios-simulator-wk2',
+ '/mock-checkout/LayoutTests/platform/ios-simulator',
+ '/mock-checkout/LayoutTests/platform/iphone-se-12-wk2',
+ '/mock-checkout/LayoutTests/platform/iphone-se-12',
+ '/mock-checkout/LayoutTests/platform/iphone-se-wk2',
+ '/mock-checkout/LayoutTests/platform/iphone-se',
+ '/mock-checkout/LayoutTests/platform/iphone-12-wk2',
+ '/mock-checkout/LayoutTests/platform/iphone-12',
+ '/mock-checkout/LayoutTests/platform/iphone-wk2',
+ '/mock-checkout/LayoutTests/platform/iphone',
+ '/mock-checkout/LayoutTests/platform/ios-12-wk2',
+ '/mock-checkout/LayoutTests/platform/ios-12',
+ '/mock-checkout/LayoutTests/platform/ios-wk2',
+ '/mock-checkout/LayoutTests/platform/ios',
+ '/mock-checkout/LayoutTests/platform/wk2',
+ ])
+
def test_max_child_processes(self):
port = self.make_port()
self.assertEqual(port.max_child_processes(DeviceType.from_string('Apple Watch')), 0)
Modified: branches/safari-607-branch/Tools/Scripts/webkitpy/port/mac.py (243768 => 243769)
--- branches/safari-607-branch/Tools/Scripts/webkitpy/port/mac.py 2019-04-02 23:33:00 UTC (rev 243768)
+++ branches/safari-607-branch/Tools/Scripts/webkitpy/port/mac.py 2019-04-03 00:03:56 UTC (rev 243769)
@@ -70,7 +70,7 @@
return ['ARCHS=i386'] if self.architecture() == 'x86' else []
@memoized
- def default_baseline_search_path(self):
+ def default_baseline_search_path(self, **kwargs):
versions_to_fallback = []
version_name_map = VersionNameMap.map(self.host.platform)
Modified: branches/safari-607-branch/Tools/Scripts/webkitpy/port/watch.py (243768 => 243769)
--- branches/safari-607-branch/Tools/Scripts/webkitpy/port/watch.py 2019-04-02 23:33:00 UTC (rev 243768)
+++ branches/safari-607-branch/Tools/Scripts/webkitpy/port/watch.py 2019-04-03 00:03:56 UTC (rev 243769)
@@ -59,7 +59,7 @@
return 4
@memoized
- def default_baseline_search_path(self):
+ def default_baseline_search_path(self, **kwargs):
versions_to_fallback = []
if self.device_version() == self.CURRENT_VERSION:
versions_to_fallback = [self.CURRENT_VERSION]
Modified: branches/safari-607-branch/Tools/Scripts/webkitpy/port/win.py (243768 => 243769)
--- branches/safari-607-branch/Tools/Scripts/webkitpy/port/win.py 2019-04-02 23:33:00 UTC (rev 243768)
+++ branches/safari-607-branch/Tools/Scripts/webkitpy/port/win.py 2019-04-03 00:03:56 UTC (rev 243769)
@@ -110,7 +110,7 @@
actual_text = delegate_regexp.sub("", actual_text)
return expected_text != actual_text
- def default_baseline_search_path(self):
+ def default_baseline_search_path(self, **kwargs):
version_name_map = VersionNameMap.map(self.host.platform)
if self._os_version < self.VERSION_MIN or self._os_version > self.VERSION_MAX:
fallback_versions = [self._os_version]
@@ -480,7 +480,7 @@
DEFAULT_ARCHITECTURE = 'x86_64'
- def default_baseline_search_path(self):
+ def default_baseline_search_path(self, **kwargs):
version_name_map = VersionNameMap.map(self.host.platform)
if self._os_version < self.VERSION_MIN or self._os_version > self.VERSION_MAX:
fallback_versions = [self._os_version]
Modified: branches/safari-607-branch/Tools/Scripts/webkitpy/port/wpe.py (243768 => 243769)
--- branches/safari-607-branch/Tools/Scripts/webkitpy/port/wpe.py 2019-04-02 23:33:00 UTC (rev 243768)
+++ branches/safari-607-branch/Tools/Scripts/webkitpy/port/wpe.py 2019-04-03 00:03:56 UTC (rev 243769)
@@ -102,7 +102,7 @@
def _search_paths(self):
return [self.port_name, 'wk2'] + self.get_option("additional_platform_directory", [])
- def default_baseline_search_path(self):
+ def default_baseline_search_path(self, **kwargs):
return map(self._webkit_baseline_path, self._search_paths())
def _port_specific_expectations_files(self):
