Diff
Modified: trunk/Tools/ChangeLog (121594 => 121595)
--- trunk/Tools/ChangeLog 2012-06-29 22:10:43 UTC (rev 121594)
+++ trunk/Tools/ChangeLog 2012-06-29 22:16:56 UTC (rev 121595)
@@ -1,3 +1,31 @@
+2012-06-29 Dirk Pranke <[email protected]>
+
+ webkitpy: remove support for mac leopard from chromium configurations
+ https://bugs.webkit.org/show_bug.cgi?id=90313
+
+ Reviewed by Tony Chang.
+
+ Google has shipped the last version of Chrome that will support
+ Mac OS 10.5 (Leopard), and we no longer have bots that run this
+ configuration, so we're removing support for it.
+
+ A subsequent change will remove the baselines in platform/chromium-mac-leopard.
+
+ * Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py:
+ (BaselineOptimizerTest.test_complex_shadowing):
+ * Scripts/webkitpy/layout_tests/port/builders.py:
+ * Scripts/webkitpy/layout_tests/port/chromium.py:
+ (ChromiumPort):
+ * Scripts/webkitpy/layout_tests/port/chromium_mac.py:
+ (ChromiumMacPort):
+ * Scripts/webkitpy/layout_tests/port/chromium_mac_unittest.py:
+ (ChromiumMacPortTest.test_versions):
+ * Scripts/webkitpy/layout_tests/port/factory_unittest.py:
+ (FactoryTest.test_mac):
+ (FactoryTest.test_chromium_mac):
+ * Scripts/webkitpy/tool/commands/rebaseline_unittest.py:
+ (test_rebaseline_and_copy_test_with_lion_result):
+
2012-06-29 Ojan Vafai <[email protected]>
Fix optimize-baselines to not move baselines from win to win-7sp0
Modified: trunk/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py (121594 => 121595)
--- trunk/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py 2012-06-29 22:10:43 UTC (rev 121594)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py 2012-06-29 22:16:56 UTC (rev 121595)
@@ -168,7 +168,6 @@
'LayoutTests/platform/chromium-win': '462d03b9c025db1b0392d7453310dbee5f9a9e74',
'LayoutTests/platform/mac': '5daa78e55f05d9f0d1bb1f32b0cd1bc3a01e9364',
'LayoutTests/platform/chromium-win-xp': '462d03b9c025db1b0392d7453310dbee5f9a9e74',
- 'LayoutTests/platform/chromium-mac-leopard': '65e7d42f8b4882b29d46dc77bb879dd41bc074dc',
'LayoutTests/platform/mac-lion': '7ad045ece7c030e2283c5d21d9587be22bcba56e',
'LayoutTests/platform/chromium-win': 'f83af9732ce74f702b8c9c4a3d9a4c6636b8d3bd',
'LayoutTests/platform/win-xp': '5b1253ef4d5094530d5f1bc6cdb95c90b446bec7',
@@ -177,7 +176,6 @@
'LayoutTests/platform/chromium-win': '462d03b9c025db1b0392d7453310dbee5f9a9e74',
'LayoutTests/platform/mac': '5daa78e55f05d9f0d1bb1f32b0cd1bc3a01e9364',
'LayoutTests/platform/chromium-win-xp': '462d03b9c025db1b0392d7453310dbee5f9a9e74',
- 'LayoutTests/platform/chromium-mac-leopard': '65e7d42f8b4882b29d46dc77bb879dd41bc074dc',
'LayoutTests/platform/mac-lion': '7ad045ece7c030e2283c5d21d9587be22bcba56e',
'LayoutTests/platform/chromium-win': 'f83af9732ce74f702b8c9c4a3d9a4c6636b8d3bd',
'LayoutTests/platform/win-xp': '5b1253ef4d5094530d5f1bc6cdb95c90b446bec7',
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/builders.py (121594 => 121595)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/builders.py 2012-06-29 22:10:43 UTC (rev 121594)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/builders.py 2012-06-29 22:16:56 UTC (rev 121595)
@@ -44,9 +44,6 @@
"Webkit Linux": {"port_name": "chromium-linux-x86_64", "specifiers": set(["linux", "x86_64", "release"])},
"Webkit Linux 32": {"port_name": "chromium-linux-x86", "specifiers": set(["linux", "x86"])},
"Webkit Linux (dbg)": {"port_name": "chromium-linux-x86_64", "specifiers": set(["linux", "debug"])},
- "Webkit Mac10.5": {"port_name": "chromium-mac-leopard", "specifiers": set(["leopard"])},
- "Webkit Mac10.5 (dbg)(1)": {"port_name": "chromium-mac-leopard", "specifiers": set(["leopard", "debug"])},
- "Webkit Mac10.5 (dbg)(2)": {"port_name": "chromium-mac-leopard", "specifiers": set(["leopard", "debug"])},
"Webkit Mac10.6": {"port_name": "chromium-mac-snowleopard", "specifiers": set(["snowleopard"])},
"Webkit Mac10.6 (dbg)": {"port_name": "chromium-mac-snowleopard", "specifiers": set(["snowleopard", "debug"])},
"Webkit Mac10.7": {"port_name": "chromium-mac-lion", "specifiers": set(["lion"])},
@@ -79,7 +76,6 @@
# These builders are on build.webkit.org.
r"SnowLeopard": "mac-snowleopard",
r"Apple Lion": "mac-lion",
- r"Leopard": "mac-leopard",
r"Windows": "win",
r"GTK": "gtk",
r"Qt": "qt",
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py (121594 => 121595)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py 2012-06-29 22:10:43 UTC (rev 121594)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py 2012-06-29 22:16:56 UTC (rev 121595)
@@ -53,7 +53,6 @@
"""Abstract base class for Chromium implementations of the Port class."""
ALL_SYSTEMS = (
- ('leopard', 'x86'),
('snowleopard', 'x86'),
('lion', 'x86'),
('xp', 'x86'),
@@ -71,7 +70,7 @@
]
CONFIGURATION_SPECIFIER_MACROS = {
- 'mac': ['leopard', 'snowleopard', 'lion'],
+ 'mac': ['snowleopard', 'lion'],
'win': ['xp', 'win7'],
'linux': ['lucid'],
'android': ['icecreamsandwich'],
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac.py (121594 => 121595)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac.py 2012-06-29 22:10:43 UTC (rev 121594)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac.py 2012-06-29 22:16:56 UTC (rev 121595)
@@ -39,17 +39,10 @@
class ChromiumMacPort(chromium.ChromiumPort):
- SUPPORTED_OS_VERSIONS = ('leopard', 'snowleopard', 'lion', 'future')
+ SUPPORTED_OS_VERSIONS = ('snowleopard', 'lion', 'future')
port_name = 'chromium-mac'
FALLBACK_PATHS = {
- 'leopard': [
- 'chromium-mac-leopard',
- 'chromium-mac-snowleopard',
- 'chromium-mac',
- 'chromium',
- 'mac',
- ],
'snowleopard': [
'chromium-mac-snowleopard',
'chromium-mac',
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac_unittest.py (121594 => 121595)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac_unittest.py 2012-06-29 22:10:43 UTC (rev 121594)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac_unittest.py 2012-06-29 22:16:56 UTC (rev 121595)
@@ -44,13 +44,8 @@
self.assertEquals(expected, port.name())
def test_versions(self):
- self.assertTrue(self.make_port().name() in ('chromium-mac-leopard', 'chromium-mac-snowleopard', 'chromium-mac-lion', 'chromium-mac-future'))
+ self.assertTrue(self.make_port().name() in ('chromium-mac-snowleopard', 'chromium-mac-lion', 'chromium-mac-future'))
- self.assert_name(None, 'leopard', 'chromium-mac-leopard')
- self.assert_name('chromium-mac', 'leopard', 'chromium-mac-leopard')
- self.assert_name('chromium-mac-leopard', 'leopard', 'chromium-mac-leopard')
- self.assert_name('chromium-mac-leopard', 'snowleopard', 'chromium-mac-leopard')
-
self.assert_name(None, 'snowleopard', 'chromium-mac-snowleopard')
self.assert_name('chromium-mac', 'snowleopard', 'chromium-mac-snowleopard')
self.assert_name('chromium-mac-snowleopard', 'leopard', 'chromium-mac-snowleopard')
@@ -67,9 +62,6 @@
self.assertRaises(AssertionError, self.assert_name, None, 'tiger', 'should-raise-assertion-so-this-value-does-not-matter')
def test_baseline_path(self):
- port = self.make_port(port_name='chromium-mac-leopard')
- self.assertEquals(port.baseline_path(), port._webkit_baseline_path('chromium-mac-leopard'))
-
port = self.make_port(port_name='chromium-mac-snowleopard')
self.assertEquals(port.baseline_path(), port._webkit_baseline_path('chromium-mac-snowleopard'))
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/factory_unittest.py (121594 => 121595)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/factory_unittest.py 2012-06-29 22:10:43 UTC (rev 121594)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/factory_unittest.py 2012-06-29 22:16:56 UTC (rev 121595)
@@ -58,8 +58,8 @@
def test_mac(self):
self.assert_port(port_name='mac-leopard', cls=mac.MacPort)
self.assert_port(port_name='mac-leopard-wk2', cls=mac.MacPort)
- self.assert_port(port_name='mac', os_name='mac', os_version='leopard', cls=mac.MacPort)
- self.assert_port(port_name=None, os_name='mac', os_version='leopard', cls=mac.MacPort)
+ self.assert_port(port_name='mac', os_name='mac', os_version='lion', cls=mac.MacPort)
+ self.assert_port(port_name=None, os_name='mac', os_version='lion', cls=mac.MacPort)
def test_win(self):
self.assert_port(port_name='win-xp', cls=win.WinPort)
@@ -75,10 +75,9 @@
self.assert_port(port_name='qt', cls=qt.QtPort)
def test_chromium_mac(self):
- self.assert_port(port_name='chromium-mac-leopard', cls=chromium_mac.ChromiumMacPort)
- self.assert_port(port_name='chromium-mac', os_name='mac', os_version='leopard',
+ self.assert_port(port_name='chromium-mac', os_name='mac', os_version='snowleopard',
cls=chromium_mac.ChromiumMacPort)
- self.assert_port(port_name='chromium', os_name='mac', os_version='leopard',
+ self.assert_port(port_name='chromium', os_name='mac', os_version='lion',
cls=chromium_mac.ChromiumMacPort)
def test_chromium_linux(self):
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py (121594 => 121595)
--- trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py 2012-06-29 22:10:43 UTC (rev 121594)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py 2012-06-29 22:16:56 UTC (rev 121595)
@@ -99,7 +99,7 @@
OutputCapture().assert_outputs(self, command._rebaseline_test_and_update_expectations, ["Webkit Mac10.7", "userscripts/another-test.html", None], expected_logs=expected_logs)
new_expectations = tool.filesystem.read_text_file(lion_port.path_to_test_expectations_file())
- self.assertEqual(new_expectations, "BUGX LEOPARD SNOWLEOPARD : userscripts/another-test.html = IMAGE\nBUGZ LINUX : userscripts/another-test.html = IMAGE\n")
+ self.assertEqual(new_expectations, "BUGX SNOWLEOPARD : userscripts/another-test.html = IMAGE\nBUGZ LINUX : userscripts/another-test.html = IMAGE\n")
def test_rebaseline_does_not_include_overrides(self):
command = RebaselineTest()
@@ -119,7 +119,7 @@
OutputCapture().assert_outputs(self, command._rebaseline_test_and_update_expectations, ["Webkit Mac10.7", "userscripts/another-test.html", None], expected_logs=expected_logs)
new_expectations = tool.filesystem.read_text_file(lion_port.path_to_test_expectations_file())
- self.assertEqual(new_expectations, "BUGX LEOPARD SNOWLEOPARD : userscripts/another-test.html = IMAGE\nBUGZ LINUX : userscripts/another-test.html = IMAGE\n")
+ self.assertEqual(new_expectations, "BUGX SNOWLEOPARD : userscripts/another-test.html = IMAGE\nBUGZ LINUX : userscripts/another-test.html = IMAGE\n")
def test_rebaseline_test(self):
command = RebaselineTest()
@@ -169,10 +169,9 @@
tool.filesystem.write_text_file(os.path.join(lion_port.baseline_path(), "userscripts/another-test-expected.txt"), "Dummy expected result")
expected_logs = """Copying baseline from /mock-checkout/LayoutTests/platform/chromium-mac/userscripts/another-test-expected.txt to /mock-checkout/LayoutTests/platform/chromium-mac-snowleopard/userscripts/another-test-expected.txt.
-Copying baseline from /mock-checkout/LayoutTests/platform/chromium-mac/userscripts/another-test-expected.txt to /mock-checkout/LayoutTests/platform/chromium-mac-leopard/userscripts/another-test-expected.txt.
Retrieving http://example.com/f/builders/Webkit Mac10.7/results/layout-test-results/userscripts/another-test-actual.txt.
"""
- OutputCapture().assert_outputs(self, command._rebaseline_test, ["Webkit Mac10.7", "userscripts/another-test.html", ["chromium-mac-snowleopard", "chromium-mac-leopard"], "txt"], expected_logs=expected_logs)
+ OutputCapture().assert_outputs(self, command._rebaseline_test, ["Webkit Mac10.7", "userscripts/another-test.html", ["chromium-mac-snowleopard"], "txt"], expected_logs=expected_logs)
def test_rebaseline_and_copy_no_overwrite_test(self):
command = RebaselineTest()
@@ -209,9 +208,6 @@
Retrieving results for chromium-linux-x86_64 from Webkit Linux.
userscripts/another-test.html (txt)
userscripts/images.svg (png)
-Retrieving results for chromium-mac-leopard from Webkit Mac10.5.
- userscripts/another-test.html (txt)
- userscripts/images.svg (png)
Retrieving results for chromium-mac-lion from Webkit Mac10.7.
userscripts/another-test.html (txt)
userscripts/images.svg (png)
@@ -245,8 +241,6 @@
MOCK run_command: ['echo', 'rebaseline-test', '--suffixes', 'png', 'Webkit Linux 32', 'userscripts/images.svg'], cwd=/mock-checkout
MOCK run_command: ['echo', 'rebaseline-test', '--suffixes', 'txt', 'Webkit Linux', 'userscripts/another-test.html'], cwd=/mock-checkout
MOCK run_command: ['echo', 'rebaseline-test', '--suffixes', 'png', 'Webkit Linux', 'userscripts/images.svg'], cwd=/mock-checkout
-MOCK run_command: ['echo', 'rebaseline-test', '--suffixes', 'txt', 'Webkit Mac10.5', 'userscripts/another-test.html'], cwd=/mock-checkout
-MOCK run_command: ['echo', 'rebaseline-test', '--suffixes', 'png', 'Webkit Mac10.5', 'userscripts/images.svg'], cwd=/mock-checkout
MOCK run_command: ['echo', 'rebaseline-test', '--suffixes', 'txt', 'Webkit Mac10.7', 'userscripts/another-test.html'], cwd=/mock-checkout
MOCK run_command: ['echo', 'rebaseline-test', '--suffixes', 'png', 'Webkit Mac10.7', 'userscripts/images.svg'], cwd=/mock-checkout
MOCK run_command: ['echo', 'rebaseline-test', '--suffixes', 'txt', 'Webkit Mac10.6', 'userscripts/another-test.html'], cwd=/mock-checkout
