Diff
Modified: trunk/Tools/ChangeLog (86695 => 86696)
--- trunk/Tools/ChangeLog 2011-05-17 19:26:11 UTC (rev 86695)
+++ trunk/Tools/ChangeLog 2011-05-17 19:29:25 UTC (rev 86696)
@@ -1,3 +1,23 @@
+2011-05-17 Tony Chang <[email protected]>
+
+ Reviewed by Ojan Vafai.
+
+ [chromium] move Lucid 64 bit results into LayoutTests/platform/chromium-linux
+ https://bugs.webkit.org/show_bug.cgi?id=60895
+
+ Update the tools to handle the move. Lucid 32 results now go in
+ chromium-linux-x86 and the default platform on Linux is now x86_64.
+
+ * Scripts/webkitpy/layout_tests/deduplicate_tests.py: Default to x86_64
+ * Scripts/webkitpy/layout_tests/deduplicate_tests_unittest.py:
+ * Scripts/webkitpy/layout_tests/layout_package/test_expectations.py: Default to Lucid
+ * Scripts/webkitpy/layout_tests/port/base.py: ditto
+ * Scripts/webkitpy/layout_tests/port/chromium_linux.py: Update directory fallback and default to Lucid 64
+ * Scripts/webkitpy/layout_tests/port/chromium_linux_unittest.py:
+ * Scripts/webkitpy/layout_tests/port/test.py: Update tests to default to x86_64
+ * Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py: Update bot names.
+ * Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests_unittest.py: Whitespace cleanup.
+
2011-05-17 Adam Roben <[email protected]>
Make run-api-tests work on Windows when there are spaces in the path
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/deduplicate_tests.py (86695 => 86696)
--- trunk/Tools/Scripts/webkitpy/layout_tests/deduplicate_tests.py 2011-05-17 19:26:11 UTC (rev 86695)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/deduplicate_tests.py 2011-05-17 19:29:25 UTC (rev 86696)
@@ -120,7 +120,7 @@
def dirname_to_platform(dirname):
if dirname == 'chromium-linux':
- return 'chromium-linux-x86'
+ return 'chromium-linux-x86_64'
elif dirname == 'chromium-win':
return 'chromium-win-win7'
elif dirname == 'chromium-mac':
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/deduplicate_tests_unittest.py (86695 => 86696)
--- trunk/Tools/Scripts/webkitpy/layout_tests/deduplicate_tests_unittest.py 2011-05-17 19:26:11 UTC (rev 86695)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/deduplicate_tests_unittest.py 2011-05-17 19:29:25 UTC (rev 86696)
@@ -159,12 +159,12 @@
self.assertEquals({'test': 'animage.png',
'path': 'LayoutTests/platform/chromium-linux/animage.png',
'fallback': 'chromium-win',
- 'platform': 'chromium-linux-x86'},
+ 'platform': 'chromium-linux-x86_64'},
result[0])
self.assertEquals({'test': 'foo-expected.txt',
'path': 'LayoutTests/platform/chromium-linux/foo-expected.txt',
'fallback': 'chromium-win',
- 'platform': 'chromium-linux-x86'},
+ 'platform': 'chromium-linux-x86_64'},
result[1])
result = deduplicate_tests.deduplicate('*.txt')
@@ -174,7 +174,7 @@
self.assertEquals({'test': 'foo-expected.txt',
'path': 'LayoutTests/platform/chromium-linux/foo-expected.txt',
'fallback': 'chromium-win',
- 'platform': 'chromium-linux-x86'},
+ 'platform': 'chromium-linux-x86_64'},
result[0])
result = deduplicate_tests.deduplicate('*.png')
@@ -184,7 +184,7 @@
self.assertEquals({'test': 'animage.png',
'path': 'LayoutTests/platform/chromium-linux/animage.png',
'fallback': 'chromium-win',
- 'platform': 'chromium-linux-x86'},
+ 'platform': 'chromium-linux-x86_64'},
result[0])
def test_get_relative_test_path(self):
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/test_expectations.py (86695 => 86696)
--- trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/test_expectations.py 2011-05-17 19:26:11 UTC (rev 86695)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/test_expectations.py 2011-05-17 19:29:25 UTC (rev 86696)
@@ -805,7 +805,7 @@
MACROS = {
'mac': ['leopard', 'snowleopard'],
'win': ['xp', 'vista', 'win7'],
- 'linux': ['hardy'],
+ 'linux': ['lucid'],
}
# We don't include the "none" modifier because it isn't actually legal.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py (86695 => 86696)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py 2011-05-17 19:26:11 UTC (rev 86695)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py 2011-05-17 19:29:25 UTC (rev 86696)
@@ -1048,8 +1048,8 @@
('xp', 'x86'),
('vista', 'x86'),
('win7', 'x86'),
- ('hardy', 'x86'),
- ('hardy', 'x86_64'))
+ ('lucid', 'x86'),
+ ('lucid', 'x86_64'))
def all_build_types(self):
return ('debug', 'release')
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_linux.py (86695 => 86696)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_linux.py 2011-05-17 19:26:11 UTC (rev 86695)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_linux.py 2011-05-17 19:29:25 UTC (rev 86696)
@@ -43,8 +43,8 @@
SUPPORTED_ARCHITECTURES = ('x86', 'x86_64')
FALLBACK_PATHS = {
- 'x86_64': ['chromium-linux-x86_64', 'chromium-linux', 'chromium-win', 'chromium', 'win', 'mac'],
- 'x86': ['chromium-linux', 'chromium-win', 'chromium', 'win', 'mac'],
+ 'x86_64': ['chromium-linux', 'chromium-win', 'chromium', 'win', 'mac'],
+ 'x86': ['chromium-linux-x86', 'chromium-linux', 'chromium-win', 'chromium', 'win', 'mac'],
}
def __init__(self, port_name=None, **kwargs):
@@ -68,8 +68,7 @@
'chromium-gpu-linux-x86_64')
self._name = port_name
self._operating_system = 'linux'
- # FIXME: add support for 'lucid'
- self._version = 'hardy'
+ self._version = 'lucid' # We only support lucid right now.
def _determine_architecture(self):
driver_path = self._path_to_driver()
@@ -90,7 +89,7 @@
# maybe we're rebaselining and the binary doesn't actually exist,
# or something else weird is going on. It's okay to do this because
# if we actually try to use the binary, check_build() should fail.
- return 'x86'
+ return 'x86_64'
def baseline_search_path(self):
port_names = self.FALLBACK_PATHS[self._architecture]
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_linux_unittest.py (86695 => 86696)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_linux_unittest.py 2011-05-17 19:26:11 UTC (rev 86695)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_linux_unittest.py 2011-05-17 19:29:25 UTC (rev 86696)
@@ -53,12 +53,12 @@
executive=executive, filesystem=filesystem)
self.assertEquals(port.architecture(), expected_architecture)
if expected_architecture == 'x86':
+ self.assertTrue(port.baseline_path().endswith('chromium-linux-x86'))
+ self.assertTrue(port.baseline_search_path()[0].endswith('chromium-linux-x86'))
+ self.assertTrue(port.baseline_search_path()[1].endswith('chromium-linux'))
+ else:
self.assertTrue(port.baseline_path().endswith('chromium-linux'))
self.assertTrue(port.baseline_search_path()[0].endswith('chromium-linux'))
- else:
- self.assertTrue(port.baseline_path().endswith('chromium-linux-x86_64'))
- self.assertTrue(port.baseline_search_path()[0].endswith('chromium-linux-x86_64'))
- self.assertTrue(port.baseline_search_path()[1].endswith('chromium-linux'))
def test_architectures(self):
self.assert_architecture(port_name='chromium-linux-x86',
@@ -82,7 +82,7 @@
# Test that we default to 'x86' if the driver doesn't exist.
filesystem = filesystem_mock.MockFileSystem()
port = chromium_linux.ChromiumLinuxPort(filesystem=filesystem)
- self.assertEquals(port.architecture(), 'x86')
+ self.assertEquals(port.architecture(), 'x86_64')
# Test that we default to 'x86' on an unknown architecture.
filesystem = filesystem_mock.MockFileSystem()
@@ -90,7 +90,7 @@
executive = executive_mock.MockExecutive2('win32')
port = chromium_linux.ChromiumLinuxPort(filesystem=filesystem,
executive=executive)
- self.assertEquals(port.architecture(), 'x86')
+ self.assertEquals(port.architecture(), 'x86_64')
# Test that we raise errors if something weird happens.
filesystem = filesystem_mock.MockFileSystem()
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/test.py (86695 => 86696)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/test.py 2011-05-17 19:26:11 UTC (rev 86695)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/test.py 2011-05-17 19:29:25 UTC (rev 86696)
@@ -245,7 +245,7 @@
ALL_BASELINE_VARIANTS = (
'test-mac-snowleopard', 'test-mac-leopard',
'test-win-win7', 'test-win-vista', 'test-win-xp',
- 'test-linux-x86',
+ 'test-linux-x86_64',
)
def __init__(self, port_name=None, user=None, filesystem=None, **kwargs):
@@ -272,7 +272,7 @@
'test-win-vista': 'vista',
'test-mac-leopard': 'leopard',
'test-mac-snowleopard': 'snowleopard',
- 'test-linux-x86': '',
+ 'test-linux-x86_64': '',
}
self._version = version_map[port_name]
@@ -290,7 +290,7 @@
'test-win-win7': ['test-win-win7'],
'test-win-vista': ['test-win-vista', 'test-win-win7'],
'test-win-xp': ['test-win-xp', 'test-win-vista', 'test-win-win7'],
- 'test-linux-x86': ['test-linux', 'test-win-win7'],
+ 'test-linux-x86_64': ['test-linux', 'test-win-win7'],
}
return [self._webkit_baseline_path(d) for d in search_paths[self.name()]]
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py (86695 => 86696)
--- trunk/Tools/Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py 2011-05-17 19:26:11 UTC (rev 86695)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py 2011-05-17 19:29:25 UTC (rev 86696)
@@ -70,8 +70,8 @@
'chromium-win-xp': 'Webkit_Win',
'chromium-mac-leopard': 'Webkit_Mac10_5',
'chromium-mac-snowleopard': 'Webkit_Mac10_6',
- 'chromium-linux-x86': 'Webkit_Linux',
- 'chromium-linux-x86_64': 'Webkit_Linux_64',
+ 'chromium-linux-x86': 'Webkit_Linux_32',
+ 'chromium-linux-x86_64': 'Webkit_Linux',
'chromium-gpu-mac-snowleopard': 'Webkit_Mac10_6_-_GPU',
'chromium-gpu-win-xp': 'Webkit_Win_-_GPU',
'chromium-gpu-win-win7': 'Webkit_Win7_-_GPU',
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests_unittest.py (86695 => 86696)
--- trunk/Tools/Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests_unittest.py 2011-05-17 19:26:11 UTC (rev 86695)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests_unittest.py 2011-05-17 19:29:25 UTC (rev 86696)
@@ -107,22 +107,22 @@
'layout-test-results/failures/expected/image-actual.checksum': 'new-image-checksum',
'layout-test-results/failures/expected/image-actual.png': 'new-image-png',
},
- ARCHIVE_URL + '/Webkit_Vista/1/layout-test-results.zip': {
+ ARCHIVE_URL + '/Webkit_Vista/1/layout-test-results.zip': {
'layout-test-results/failures/expected/image-actual.txt': 'win-image-txt',
'layout-test-results/failures/expected/image-actual.checksum': 'win-image-checksum',
'layout-test-results/failures/expected/image-actual.png': 'win-image-png',
},
- ARCHIVE_URL + '/Webkit_Win7/1/layout-test-results.zip': {
+ ARCHIVE_URL + '/Webkit_Win7/1/layout-test-results.zip': {
'layout-test-results/failures/expected/image-actual.txt': 'win-image-txt',
'layout-test-results/failures/expected/image-actual.checksum': 'win-image-checksum',
'layout-test-results/failures/expected/image-actual.png': 'win-image-png',
},
- ARCHIVE_URL + '/Webkit_Win/1/layout-test-results.zip': {
+ ARCHIVE_URL + '/Webkit_Win/1/layout-test-results.zip': {
'layout-test-results/failures/expected/image-actual.txt': 'win-image-txt',
'layout-test-results/failures/expected/image-actual.checksum': 'win-image-checksum',
'layout-test-results/failures/expected/image-actual.png': 'win-image-png',
},
- ARCHIVE_URL + '/Webkit_Linux/1/layout-test-results.zip': {
+ ARCHIVE_URL + '/Webkit_Linux/1/layout-test-results.zip': {
'layout-test-results/failures/expected/image-actual.txt': 'win-image-txt',
'layout-test-results/failures/expected/image-actual.checksum': 'win-image-checksum',
'layout-test-results/failures/expected/image-actual.png': 'win-image-png',
