Title: [221877] trunk/Tools
- Revision
- 221877
- Author
- [email protected]
- Date
- 2017-09-11 14:13:19 -0700 (Mon, 11 Sep 2017)
Log Message
Older versions should adopt newer version's expectations on mac
https://bugs.webkit.org/show_bug.cgi?id=176699
<rdar://problem/34367907>
Reviewed by Alexey Proskuryakov.
Before:
mac-elcapitan-wk2
mac-elcapitan
mac-wk2
mac
wk2
After:
mac-elcapitan-wk2
mac-elcapitan
mac-sierra-wk2
mac-sierra
mac-wk2
mac
wk2
* Scripts/webkitpy/port/mac.py:
(MacPort.default_baseline_search_path): Use VERSION_FALLBACK_ORDER to have old
versions inherit expectations from newer versions.
* Scripts/webkitpy/port/mac_unittest.py:
(MacTest.test_layout_test_searchpath_with_apple_additions): Check new behavior
with older versions inheriting expectations from newer versions.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (221876 => 221877)
--- trunk/Tools/ChangeLog 2017-09-11 21:11:33 UTC (rev 221876)
+++ trunk/Tools/ChangeLog 2017-09-11 21:13:19 UTC (rev 221877)
@@ -1,3 +1,33 @@
+2017-09-11 Jonathan Bedard <[email protected]>
+
+ Older versions should adopt newer version's expectations on mac
+ https://bugs.webkit.org/show_bug.cgi?id=176699
+ <rdar://problem/34367907>
+
+ Reviewed by Alexey Proskuryakov.
+
+ Before:
+ mac-elcapitan-wk2
+ mac-elcapitan
+ mac-wk2
+ mac
+ wk2
+ After:
+ mac-elcapitan-wk2
+ mac-elcapitan
+ mac-sierra-wk2
+ mac-sierra
+ mac-wk2
+ mac
+ wk2
+
+ * Scripts/webkitpy/port/mac.py:
+ (MacPort.default_baseline_search_path): Use VERSION_FALLBACK_ORDER to have old
+ versions inherit expectations from newer versions.
+ * Scripts/webkitpy/port/mac_unittest.py:
+ (MacTest.test_layout_test_searchpath_with_apple_additions): Check new behavior
+ with older versions inheriting expectations from newer versions.
+
2017-09-11 Ryan Haddad <[email protected]>
Skip JSC test wsl-tests.yaml/Test.js
Modified: trunk/Tools/Scripts/webkitpy/port/mac.py (221876 => 221877)
--- trunk/Tools/Scripts/webkitpy/port/mac.py 2017-09-11 21:11:33 UTC (rev 221876)
+++ trunk/Tools/Scripts/webkitpy/port/mac.py 2017-09-11 21:13:19 UTC (rev 221877)
@@ -74,12 +74,20 @@
@memoized
def default_baseline_search_path(self):
+ mac_version = 'mac-{}'.format(self._os_version)
+ if mac_version.endswith(self.FUTURE_VERSION) or mac_version not in self.VERSION_FALLBACK_ORDER:
+ version_fallback = [self._os_version]
+ else:
+ version_fallback = self.VERSION_FALLBACK_ORDER[self.VERSION_FALLBACK_ORDER.index(mac_version):-1]
wk_string = 'wk1'
if self.get_option('webkit_test_runner'):
wk_string = 'wk2'
- fallback_names = [
- '{}-{}-{}'.format(self.port_name, self._os_version, wk_string),
- '{}-{}'.format(self.port_name, self._os_version),
+
+ fallback_names = []
+ for version in version_fallback:
+ fallback_names.append('{}-{}'.format(version, wk_string))
+ fallback_names.append(version)
+ fallback_names = fallback_names + [
'{}-{}'.format(self.port_name, wk_string),
self.port_name,
]
Modified: trunk/Tools/Scripts/webkitpy/port/mac_unittest.py (221876 => 221877)
--- trunk/Tools/Scripts/webkitpy/port/mac_unittest.py 2017-09-11 21:11:33 UTC (rev 221876)
+++ trunk/Tools/Scripts/webkitpy/port/mac_unittest.py 2017-09-11 21:13:19 UTC (rev 221877)
@@ -150,3 +150,5 @@
self.assertEqual(search_path[1], '/mock-checkout/LayoutTests/platform/mac-lion-wk1')
self.assertEqual(search_path[2], '/additional_testing_path/mac-add-lion')
self.assertEqual(search_path[3], '/mock-checkout/LayoutTests/platform/mac-lion')
+ self.assertEqual(search_path[4], '/additional_testing_path/mac-add-mountainlion-wk1')
+ self.assertEqual(search_path[5], '/mock-checkout/LayoutTests/platform/mac-mountainlion-wk1')
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
