Log Message
Teach webkitpy about OS X Yosemite https://bugs.webkit.org/show_bug.cgi?id=137585
Reviewed by Simon Fraser. * Scripts/webkitpy/common/system/platforminfo.py: (PlatformInfo._determine_mac_version): * Scripts/webkitpy/common/system/platforminfo_unittest.py: (TestPlatformInfo.test_os_version): * Scripts/webkitpy/layout_tests/models/test_expectations.py: (TestExpectationParser): * Scripts/webkitpy/port/builders.py: * Scripts/webkitpy/port/mac.py: (MacPort): * Scripts/webkitpy/port/mac_unittest.py: (test_versions): (test_baseline_search_path): * Scripts/webkitpy/tool/commands/rebaseline_unittest.py: (TestRebaselineTest.test_baseline_directory): (TestRebaselineExpectations.test_rebaseline_expectations):
Modified Paths
- trunk/Tools/ChangeLog
- trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py
- trunk/Tools/Scripts/webkitpy/common/system/platforminfo_unittest.py
- trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py
- trunk/Tools/Scripts/webkitpy/port/builders.py
- trunk/Tools/Scripts/webkitpy/port/mac.py
- trunk/Tools/Scripts/webkitpy/port/mac_unittest.py
- trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py
Diff
Modified: trunk/Tools/ChangeLog (174555 => 174556)
--- trunk/Tools/ChangeLog 2014-10-10 03:45:20 UTC (rev 174555)
+++ trunk/Tools/ChangeLog 2014-10-10 03:50:55 UTC (rev 174556)
@@ -1,3 +1,26 @@
+2014-10-09 Andy Estes <[email protected]>
+
+ Teach webkitpy about OS X Yosemite
+ https://bugs.webkit.org/show_bug.cgi?id=137585
+
+ Reviewed by Simon Fraser.
+
+ * Scripts/webkitpy/common/system/platforminfo.py:
+ (PlatformInfo._determine_mac_version):
+ * Scripts/webkitpy/common/system/platforminfo_unittest.py:
+ (TestPlatformInfo.test_os_version):
+ * Scripts/webkitpy/layout_tests/models/test_expectations.py:
+ (TestExpectationParser):
+ * Scripts/webkitpy/port/builders.py:
+ * Scripts/webkitpy/port/mac.py:
+ (MacPort):
+ * Scripts/webkitpy/port/mac_unittest.py:
+ (test_versions):
+ (test_baseline_search_path):
+ * Scripts/webkitpy/tool/commands/rebaseline_unittest.py:
+ (TestRebaselineTest.test_baseline_directory):
+ (TestRebaselineExpectations.test_rebaseline_expectations):
+
2014-10-09 Dana Burkart <[email protected]>
Add Mac OS Yosemite dashboard support.
Modified: trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py (174555 => 174556)
--- trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py 2014-10-10 03:45:20 UTC (rev 174555)
+++ trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py 2014-10-10 03:50:55 UTC (rev 174556)
@@ -141,6 +141,7 @@
7: 'lion',
8: 'mountainlion',
9: 'mavericks',
+ 10: 'yosemite',
}
assert release_version >= min(version_strings.keys())
return version_strings.get(release_version, 'future')
Modified: trunk/Tools/Scripts/webkitpy/common/system/platforminfo_unittest.py (174555 => 174556)
--- trunk/Tools/Scripts/webkitpy/common/system/platforminfo_unittest.py 2014-10-10 03:45:20 UTC (rev 174555)
+++ trunk/Tools/Scripts/webkitpy/common/system/platforminfo_unittest.py 2014-10-10 03:50:55 UTC (rev 174556)
@@ -136,7 +136,8 @@
self.assertEqual(self.make_info(fake_sys('darwin'), fake_platform('10.7.1')).os_version, 'lion')
self.assertEqual(self.make_info(fake_sys('darwin'), fake_platform('10.8.1')).os_version, 'mountainlion')
self.assertEqual(self.make_info(fake_sys('darwin'), fake_platform('10.9.0')).os_version, 'mavericks')
- self.assertEqual(self.make_info(fake_sys('darwin'), fake_platform('10.10.0')).os_version, 'future')
+ self.assertEqual(self.make_info(fake_sys('darwin'), fake_platform('10.10.0')).os_version, 'yosemite')
+ self.assertEqual(self.make_info(fake_sys('darwin'), fake_platform('10.11.0')).os_version, 'future')
self.assertEqual(self.make_info(fake_sys('linux2')).os_version, 'lucid')
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py (174555 => 174556)
--- trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py 2014-10-10 03:45:20 UTC (rev 174555)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py 2014-10-10 03:50:55 UTC (rev 174556)
@@ -209,7 +209,7 @@
# FIXME: Update the original modifiers and remove this once the old syntax is gone.
_configuration_tokens_list = [
- 'Mac', 'SnowLeopard', 'Lion', 'MountainLion', 'Mavericks',
+ 'Mac', 'SnowLeopard', 'Lion', 'MountainLion', 'Mavericks', 'Yosemite',
'Win', 'XP', 'Vista', 'Win7',
'Linux',
'Android',
Modified: trunk/Tools/Scripts/webkitpy/port/builders.py (174555 => 174556)
--- trunk/Tools/Scripts/webkitpy/port/builders.py 2014-10-10 03:45:20 UTC (rev 174555)
+++ trunk/Tools/Scripts/webkitpy/port/builders.py 2014-10-10 03:50:55 UTC (rev 174556)
@@ -48,6 +48,11 @@
_exact_matches = {
# These builders are on build.webkit.org.
+ "Apple Yosemite Release WK1 (Tests)": {"port_name": "mac-yosemite", "is_debug": False},
+ "Apple Yosemite Debug WK1 (Tests)": {"port_name": "mac-yosemite", "is_debug": True},
+ "Apple Yosemite Release WK2 (Tests)": {"port_name": "mac-yosemite-wk2", "is_debug": False},
+ "Apple Yosemite Debug WK2 (Tests)": {"port_name": "mac-yosemite-wk2", "is_debug": True},
+
"Apple Mavericks Release WK1 (Tests)": {"port_name": "mac-mavericks", "is_debug": False},
"Apple Mavericks Debug WK1 (Tests)": {"port_name": "mac-mavericks", "is_debug": True},
"Apple Mavericks Release WK2 (Tests)": {"port_name": "mac-mavericks-wk2", "is_debug": False},
Modified: trunk/Tools/Scripts/webkitpy/port/mac.py (174555 => 174556)
--- trunk/Tools/Scripts/webkitpy/port/mac.py 2014-10-10 03:45:20 UTC (rev 174555)
+++ trunk/Tools/Scripts/webkitpy/port/mac.py 2014-10-10 03:50:55 UTC (rev 174556)
@@ -44,7 +44,7 @@
class MacPort(ApplePort):
port_name = "mac"
- VERSION_FALLBACK_ORDER = ['mac-snowleopard', 'mac-lion', 'mac-mountainlion', 'mac-mavericks']
+ VERSION_FALLBACK_ORDER = ['mac-snowleopard', 'mac-lion', 'mac-mountainlion', 'mac-mavericks', 'mac-yosemite']
ARCHITECTURES = ['x86_64', 'x86']
Modified: trunk/Tools/Scripts/webkitpy/port/mac_unittest.py (174555 => 174556)
--- trunk/Tools/Scripts/webkitpy/port/mac_unittest.py 2014-10-10 03:45:20 UTC (rev 174555)
+++ trunk/Tools/Scripts/webkitpy/port/mac_unittest.py 2014-10-10 03:50:55 UTC (rev 174556)
@@ -105,6 +105,8 @@
self.assert_name('mac-mountainlion', 'lion', 'mac-mountainlion')
self.assert_name('mac', 'mavericks', 'mac-mavericks')
self.assert_name('mac-mavericks', 'mountainlion', 'mac-mavericks')
+ self.assert_name('mac', 'yosemite', 'mac-yosemite')
+ self.assert_name('mac-yosemite', 'mavericks', 'mac-yosemite')
self.assert_name('mac', 'future', 'mac-future')
self.assert_name('mac-future', 'future', 'mac-future')
self.assertRaises(AssertionError, self.assert_name, 'mac-tiger', 'leopard', 'mac-leopard')
@@ -123,15 +125,17 @@
def test_baseline_search_path(self):
# Note that we don't need total coverage here, just path coverage, since this is all data driven.
- self._assert_search_path('mac-snowleopard', 'mac-snowleopard', ['mac-snowleopard', 'mac-lion', 'mac-mountainlion', 'mac-wk1', 'mac'])
- self._assert_search_path('mac-lion', 'mac-lion', ['mac-lion', 'mac-mountainlion', 'mac-wk1', 'mac'])
- self._assert_search_path('mac-mountainlion', 'mac-mountainlion', ['mac-mountainlion', 'mac-wk1', 'mac'])
- self._assert_search_path('mac-mavericks', 'mac-wk1', ['mac-wk1', 'mac'])
+ self._assert_search_path('mac-snowleopard', 'mac-snowleopard', ['mac-snowleopard', 'mac-lion', 'mac-mountainlion', 'mac-mavericks', 'mac-wk1', 'mac'])
+ self._assert_search_path('mac-lion', 'mac-lion', ['mac-lion', 'mac-mountainlion', 'mac-mavericks', 'mac-wk1', 'mac'])
+ self._assert_search_path('mac-mountainlion', 'mac-mountainlion', ['mac-mountainlion', 'mac-mavericks', 'mac-wk1', 'mac'])
+ self._assert_search_path('mac-mavericks', 'mac-mavericks', ['mac-mavericks', 'mac-wk1', 'mac'])
+ self._assert_search_path('mac-yosemite', 'mac-wk1', ['mac-wk1', 'mac'])
self._assert_search_path('mac-future', 'mac-wk1', ['mac-wk1', 'mac'])
- self._assert_search_path('mac-snowleopard', 'mac-wk2', ['mac-wk2', 'wk2', 'mac-snowleopard', 'mac-lion', 'mac-mountainlion', 'mac'], use_webkit2=True)
- self._assert_search_path('mac-lion', 'mac-wk2', ['mac-wk2', 'wk2', 'mac-lion', 'mac-mountainlion', 'mac'], use_webkit2=True)
- self._assert_search_path('mac-mountainlion', 'mac-wk2', ['mac-wk2', 'wk2', 'mac-mountainlion', 'mac'], use_webkit2=True)
- self._assert_search_path('mac-mavericks', 'mac-wk2', ['mac-wk2', 'wk2', 'mac'], use_webkit2=True)
+ self._assert_search_path('mac-snowleopard', 'mac-wk2', ['mac-wk2', 'wk2', 'mac-snowleopard', 'mac-lion', 'mac-mountainlion', 'mac-mavericks', 'mac'], use_webkit2=True)
+ self._assert_search_path('mac-lion', 'mac-wk2', ['mac-wk2', 'wk2', 'mac-lion', 'mac-mountainlion', 'mac-mavericks', 'mac'], use_webkit2=True)
+ self._assert_search_path('mac-mountainlion', 'mac-wk2', ['mac-wk2', 'wk2', 'mac-mountainlion', 'mac-mavericks', 'mac'], use_webkit2=True)
+ self._assert_search_path('mac-mavericks', 'mac-wk2', ['mac-wk2', 'wk2', 'mac-mavericks', 'mac'], use_webkit2=True)
+ self._assert_search_path('mac-yosemite', 'mac-wk2', ['mac-wk2', 'wk2', 'mac'], use_webkit2=True)
self._assert_search_path('mac-future', 'mac-wk2', ['mac-wk2', 'wk2', 'mac'], use_webkit2=True)
def test_show_results_html_file(self):
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py (174555 => 174556)
--- trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py 2014-10-10 03:45:20 UTC (rev 174555)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py 2014-10-10 03:50:55 UTC (rev 174556)
@@ -89,8 +89,10 @@
self.assertMultiLineEqual(command._baseline_directory("Apple Lion Release WK2 (Tests)"), "/mock-checkout/LayoutTests/platform/mac-wk2")
self.assertMultiLineEqual(command._baseline_directory("Apple MountainLion Release WK1 (Tests)"), "/mock-checkout/LayoutTests/platform/mac-mountainlion")
self.assertMultiLineEqual(command._baseline_directory("Apple MountainLion Release WK2 (Tests)"), "/mock-checkout/LayoutTests/platform/mac-wk2")
- self.assertMultiLineEqual(command._baseline_directory("Apple Mavericks Release WK1 (Tests)"), "/mock-checkout/LayoutTests/platform/mac-wk1")
+ self.assertMultiLineEqual(command._baseline_directory("Apple Mavericks Release WK1 (Tests)"), "/mock-checkout/LayoutTests/platform/mac-mavericks")
self.assertMultiLineEqual(command._baseline_directory("Apple Mavericks Release WK2 (Tests)"), "/mock-checkout/LayoutTests/platform/mac-wk2")
+ self.assertMultiLineEqual(command._baseline_directory("Apple Yosemite Release WK1 (Tests)"), "/mock-checkout/LayoutTests/platform/mac-wk1")
+ self.assertMultiLineEqual(command._baseline_directory("Apple Yosemite Release WK2 (Tests)"), "/mock-checkout/LayoutTests/platform/mac-wk2")
self.assertMultiLineEqual(command._baseline_directory("GTK Linux 64-bit Debug (Tests)"), "/mock-checkout/LayoutTests/platform/gtk")
self.assertMultiLineEqual(command._baseline_directory("GTK Linux 64-bit Release (Tests)"), "/mock-checkout/LayoutTests/platform/gtk")
self.assertMultiLineEqual(command._baseline_directory("EFL Linux 64-bit Release WK2"), "/mock-checkout/LayoutTests/platform/efl")
@@ -318,7 +320,7 @@
# FIXME: change this to use the test- ports.
calls = self.tool.executive.calls
self.assertEqual(len(calls), 1)
- self.assertEqual(len(calls[0]), 20)
+ self.assertEqual(len(calls[0]), 24)
def test_rebaseline_expectations_noop(self):
self._zero_out_test_expectations()
_______________________________________________ webkit-changes mailing list [email protected] https://lists.webkit.org/mailman/listinfo/webkit-changes
