<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[174556] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/174556">174556</a></dd>
<dt>Author</dt> <dd>aestes@apple.com</dd>
<dt>Date</dt> <dd>2014-10-09 20:50:55 -0700 (Thu, 09 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonsystemplatforminfopy">trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonsystemplatforminfo_unittestpy">trunk/Tools/Scripts/webkitpy/common/system/platforminfo_unittest.py</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testsmodelstest_expectationspy">trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportbuilderspy">trunk/Tools/Scripts/webkitpy/port/builders.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportmacpy">trunk/Tools/Scripts/webkitpy/port/mac.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportmac_unittestpy">trunk/Tools/Scripts/webkitpy/port/mac_unittest.py</a></li>
<li><a href="#trunkToolsScriptswebkitpytoolcommandsrebaseline_unittestpy">trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (174555 => 174556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-10-10 03:45:20 UTC (rev 174555)
+++ trunk/Tools/ChangeLog 2014-10-10 03:50:55 UTC (rev 174556)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-10-09 Andy Estes <aestes@apple.com>
+
+ 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):
+
</ins><span class="cx"> 2014-10-09 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><span class="cx"> Add Mac OS Yosemite dashboard support.
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonsystemplatforminfopy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py (174555 => 174556)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -141,6 +141,7 @@
</span><span class="cx"> 7: 'lion',
</span><span class="cx"> 8: 'mountainlion',
</span><span class="cx"> 9: 'mavericks',
</span><ins>+ 10: 'yosemite',
</ins><span class="cx"> }
</span><span class="cx"> assert release_version >= min(version_strings.keys())
</span><span class="cx"> return version_strings.get(release_version, 'future')
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonsystemplatforminfo_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/system/platforminfo_unittest.py (174555 => 174556)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -136,7 +136,8 @@
</span><span class="cx"> self.assertEqual(self.make_info(fake_sys('darwin'), fake_platform('10.7.1')).os_version, 'lion')
</span><span class="cx"> self.assertEqual(self.make_info(fake_sys('darwin'), fake_platform('10.8.1')).os_version, 'mountainlion')
</span><span class="cx"> self.assertEqual(self.make_info(fake_sys('darwin'), fake_platform('10.9.0')).os_version, 'mavericks')
</span><del>- self.assertEqual(self.make_info(fake_sys('darwin'), fake_platform('10.10.0')).os_version, 'future')
</del><ins>+ 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')
</ins><span class="cx">
</span><span class="cx"> self.assertEqual(self.make_info(fake_sys('linux2')).os_version, 'lucid')
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testsmodelstest_expectationspy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py (174555 => 174556)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -209,7 +209,7 @@
</span><span class="cx">
</span><span class="cx"> # FIXME: Update the original modifiers and remove this once the old syntax is gone.
</span><span class="cx"> _configuration_tokens_list = [
</span><del>- 'Mac', 'SnowLeopard', 'Lion', 'MountainLion', 'Mavericks',
</del><ins>+ 'Mac', 'SnowLeopard', 'Lion', 'MountainLion', 'Mavericks', 'Yosemite',
</ins><span class="cx"> 'Win', 'XP', 'Vista', 'Win7',
</span><span class="cx"> 'Linux',
</span><span class="cx"> 'Android',
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportbuilderspy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/builders.py (174555 => 174556)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -48,6 +48,11 @@
</span><span class="cx"> _exact_matches = {
</span><span class="cx"> # These builders are on build.webkit.org.
</span><span class="cx">
</span><ins>+ "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},
+
</ins><span class="cx"> "Apple Mavericks Release WK1 (Tests)": {"port_name": "mac-mavericks", "is_debug": False},
</span><span class="cx"> "Apple Mavericks Debug WK1 (Tests)": {"port_name": "mac-mavericks", "is_debug": True},
</span><span class="cx"> "Apple Mavericks Release WK2 (Tests)": {"port_name": "mac-mavericks-wk2", "is_debug": False},
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportmacpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/mac.py (174555 => 174556)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> class MacPort(ApplePort):
</span><span class="cx"> port_name = "mac"
</span><span class="cx">
</span><del>- VERSION_FALLBACK_ORDER = ['mac-snowleopard', 'mac-lion', 'mac-mountainlion', 'mac-mavericks']
</del><ins>+ VERSION_FALLBACK_ORDER = ['mac-snowleopard', 'mac-lion', 'mac-mountainlion', 'mac-mavericks', 'mac-yosemite']
</ins><span class="cx">
</span><span class="cx"> ARCHITECTURES = ['x86_64', 'x86']
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportmac_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/mac_unittest.py (174555 => 174556)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -105,6 +105,8 @@
</span><span class="cx"> self.assert_name('mac-mountainlion', 'lion', 'mac-mountainlion')
</span><span class="cx"> self.assert_name('mac', 'mavericks', 'mac-mavericks')
</span><span class="cx"> self.assert_name('mac-mavericks', 'mountainlion', 'mac-mavericks')
</span><ins>+ self.assert_name('mac', 'yosemite', 'mac-yosemite')
+ self.assert_name('mac-yosemite', 'mavericks', 'mac-yosemite')
</ins><span class="cx"> self.assert_name('mac', 'future', 'mac-future')
</span><span class="cx"> self.assert_name('mac-future', 'future', 'mac-future')
</span><span class="cx"> self.assertRaises(AssertionError, self.assert_name, 'mac-tiger', 'leopard', 'mac-leopard')
</span><span class="lines">@@ -123,15 +125,17 @@
</span><span class="cx">
</span><span class="cx"> def test_baseline_search_path(self):
</span><span class="cx"> # Note that we don't need total coverage here, just path coverage, since this is all data driven.
</span><del>- 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'])
</del><ins>+ 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'])
</ins><span class="cx"> self._assert_search_path('mac-future', 'mac-wk1', ['mac-wk1', 'mac'])
</span><del>- 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)
</del><ins>+ 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)
</ins><span class="cx"> self._assert_search_path('mac-future', 'mac-wk2', ['mac-wk2', 'wk2', 'mac'], use_webkit2=True)
</span><span class="cx">
</span><span class="cx"> def test_show_results_html_file(self):
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpytoolcommandsrebaseline_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py (174555 => 174556)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -89,8 +89,10 @@
</span><span class="cx"> self.assertMultiLineEqual(command._baseline_directory("Apple Lion Release WK2 (Tests)"), "/mock-checkout/LayoutTests/platform/mac-wk2")
</span><span class="cx"> self.assertMultiLineEqual(command._baseline_directory("Apple MountainLion Release WK1 (Tests)"), "/mock-checkout/LayoutTests/platform/mac-mountainlion")
</span><span class="cx"> self.assertMultiLineEqual(command._baseline_directory("Apple MountainLion Release WK2 (Tests)"), "/mock-checkout/LayoutTests/platform/mac-wk2")
</span><del>- self.assertMultiLineEqual(command._baseline_directory("Apple Mavericks Release WK1 (Tests)"), "/mock-checkout/LayoutTests/platform/mac-wk1")
</del><ins>+ self.assertMultiLineEqual(command._baseline_directory("Apple Mavericks Release WK1 (Tests)"), "/mock-checkout/LayoutTests/platform/mac-mavericks")
</ins><span class="cx"> self.assertMultiLineEqual(command._baseline_directory("Apple Mavericks Release WK2 (Tests)"), "/mock-checkout/LayoutTests/platform/mac-wk2")
</span><ins>+ 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")
</ins><span class="cx"> self.assertMultiLineEqual(command._baseline_directory("GTK Linux 64-bit Debug (Tests)"), "/mock-checkout/LayoutTests/platform/gtk")
</span><span class="cx"> self.assertMultiLineEqual(command._baseline_directory("GTK Linux 64-bit Release (Tests)"), "/mock-checkout/LayoutTests/platform/gtk")
</span><span class="cx"> self.assertMultiLineEqual(command._baseline_directory("EFL Linux 64-bit Release WK2"), "/mock-checkout/LayoutTests/platform/efl")
</span><span class="lines">@@ -318,7 +320,7 @@
</span><span class="cx"> # FIXME: change this to use the test- ports.
</span><span class="cx"> calls = self.tool.executive.calls
</span><span class="cx"> self.assertEqual(len(calls), 1)
</span><del>- self.assertEqual(len(calls[0]), 20)
</del><ins>+ self.assertEqual(len(calls[0]), 24)
</ins><span class="cx">
</span><span class="cx"> def test_rebaseline_expectations_noop(self):
</span><span class="cx"> self._zero_out_test_expectations()
</span></span></pre>
</div>
</div>
</body>
</html>