Diff
Modified: trunk/Tools/ChangeLog (94030 => 94031)
--- trunk/Tools/ChangeLog 2011-08-29 23:37:25 UTC (rev 94030)
+++ trunk/Tools/ChangeLog 2011-08-29 23:39:51 UTC (rev 94031)
@@ -1,3 +1,26 @@
+2011-08-29 Adam Barth <[email protected]>
+
+ Add support for chomium-mac (non-CoreGraphics) baselines
+ https://bugs.webkit.org/show_bug.cgi?id=67163
+
+ Reviewed by Eric Seidel.
+
+ This patch teaches the non-CG chromium-mac bots to look at non-CG
+ baselines. However, the patch still leaves CG as the default set of
+ baselines.
+
+ * Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py:
+ * Scripts/webkitpy/common/config/build.py:
+ * Scripts/webkitpy/common/config/build_unittest.py:
+ * Scripts/webkitpy/layout_tests/port/builders.py:
+ * Scripts/webkitpy/layout_tests/port/chromium.py:
+ * Scripts/webkitpy/layout_tests/port/chromium_mac.py:
+ * Scripts/webkitpy/layout_tests/port/factory.py:
+ * Scripts/webkitpy/layout_tests/port/factory_unittest.py:
+ * Scripts/webkitpy/to_be_moved/rebaseline_chromium_webkit_tests.py:
+ * Scripts/webkitpy/to_be_moved/rebaseline_chromium_webkit_tests_unittest.py:
+ * Scripts/webkitpy/tool/commands/rebaseline_unittest.py:
+
2011-08-29 Shawn Singh <[email protected]>
Small fix in chromium port of new-run-webkit-tests.
Modified: trunk/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py (94030 => 94031)
--- trunk/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py 2011-08-29 23:37:25 UTC (rev 94030)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py 2011-08-29 23:39:51 UTC (rev 94031)
@@ -123,6 +123,7 @@
'LayoutTests/platform/chromium-win': '23a30302a6910f8a48b1007fa36f3e3158341834',
'LayoutTests': '9c876f8c3e4cc2aef9519a6c1174eb3432591127',
'LayoutTests/platform/chromium-cg-mac': '23a30302a6910f8a48b1007fa36f3e3158341834',
+ 'LayoutTests/platform/chromium-mac': '23a30302a6910f8a48b1007fa36f3e3158341834',
}, {
'LayoutTests/platform/chromium': '23a30302a6910f8a48b1007fa36f3e3158341834',
'LayoutTests': '9c876f8c3e4cc2aef9519a6c1174eb3432591127',
Modified: trunk/Tools/Scripts/webkitpy/common/config/build.py (94030 => 94031)
--- trunk/Tools/Scripts/webkitpy/common/config/build.py 2011-08-29 23:37:25 UTC (rev 94030)
+++ trunk/Tools/Scripts/webkitpy/common/config/build.py 2011-08-29 23:39:51 UTC (rev 94031)
@@ -61,15 +61,15 @@
("Source/WebCore/image-decoders", ["chromium"]),
("LayoutTests/platform/mac", ["mac", "win"]),
("cairo", ["gtk", "wincairo"]),
- ("cf", ["chromium-cg-mac", "mac", "qt", "win"]),
+ ("cf", ["chromium-mac", "chromium-cg-mac", "mac", "qt", "win"]),
("chromium", ["chromium"]),
- ("cocoa", ["chromium-cg-mac", "mac"]),
+ ("cocoa", ["chromium-mac", "chromium-cg-mac", "mac"]),
("curl", ["gtk", "wincairo"]),
("gobject", ["gtk"]),
("gpu", ["chromium", "mac"]),
("gstreamer", ["gtk"]),
("gtk", ["gtk"]),
- ("mac", ["chromium-cg-mac", "mac"]),
+ ("mac", ["chromium-mac", "chromium-cg-mac", "mac"]),
("mac-leopard", ["mac-leopard"]),
("mac-lion", ["mac", "win"]),
("mac-snowleopard", ["mac-leopard", "mac-snowleopard"]),
Modified: trunk/Tools/Scripts/webkitpy/common/config/build_unittest.py (94030 => 94031)
--- trunk/Tools/Scripts/webkitpy/common/config/build_unittest.py 2011-08-29 23:37:25 UTC (rev 94030)
+++ trunk/Tools/Scripts/webkitpy/common/config/build_unittest.py 2011-08-29 23:39:51 UTC (rev 94031)
@@ -48,7 +48,7 @@
(["LayoutTests/platform/win-wk2/foo"], ["win"]),
(["LayoutTests/platform/win/foo"], ["win"]),
(["Source/WebCore.exp.in", "Source/WebKit/mac/WebKit.exp"], ["mac-leopard", "mac-lion", "mac-snowleopard"]),
- (["Source/WebCore/mac/foo"], ["chromium-cg-mac", "mac-leopard", "mac-lion", "mac-snowleopard"]),
+ (["Source/WebCore/mac/foo"], ["chromium-mac", "chromium-cg-mac", "mac-leopard", "mac-lion", "mac-snowleopard"]),
(["Source/WebCore/win/foo"], ["chromium-win", "win"]),
(["Source/WebCore/platform/graphics/gpu/foo"], ["mac-leopard", "mac-lion", "mac-snowleopard"]),
(["Source/WebCore/platform/wx/wxcode/win/foo"], []),
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/builders.py (94030 => 94031)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/builders.py 2011-08-29 23:37:25 UTC (rev 94030)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/builders.py 2011-08-29 23:39:51 UTC (rev 94031)
@@ -46,6 +46,11 @@
"Webkit Linux 32": {"port_name": "chromium-linux-x86", "specifiers": set(["linux", "x86"])},
"Webkit Linux (dbg)(1)": {"port_name": "chromium-linux-x86_64", "specifiers": set(["linux", "debug"])},
"Webkit Linux (dbg)(2)": {"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.5 (CG)": {"port_name": "chromium-cg-mac-leopard", "specifiers": set(["leopard"])},
"Webkit Mac10.5 (CG)(dbg)(1)": {"port_name": "chromium-cg-mac-leopard", "specifiers": set(["leopard", "debug"])},
"Webkit Mac10.5 (CG)(dbg)(2)": {"port_name": "chromium-cg-mac-leopard", "specifiers": set(["leopard", "debug"])},
@@ -77,7 +82,7 @@
r"Windows": "win",
r"GTK": "gtk",
r"Qt": "qt",
- r"Chromium Mac": "chromium-cg-mac",
+ r"Chromium Mac": "chromium-mac",
r"Chromium Linux": "chromium-linux",
r"Chromium Win": "chromium-win",
}
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py (94030 => 94031)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py 2011-08-29 23:37:25 UTC (rev 94030)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py 2011-08-29 23:39:51 UTC (rev 94031)
@@ -73,6 +73,7 @@
CORE_GRAPHICS_TYPES = ('cpu-cg', 'gpu-cg')
ALL_BASELINE_VARIANTS = [
+ 'chromium-mac-snowleopard', 'chromium-mac-leopard',
'chromium-cg-mac-snowleopard', 'chromium-cg-mac-leopard',
'chromium-win-win7', 'chromium-win-vista', 'chromium-win-xp',
'chromium-linux-x86_64', 'chromium-linux-x86',
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac.py (94030 => 94031)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac.py 2011-08-29 23:37:25 UTC (rev 94030)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac.py 2011-08-29 23:39:51 UTC (rev 94031)
@@ -47,6 +47,28 @@
FALLBACK_PATHS = {
'leopard': [
+ 'chromium-mac-leopard',
+ 'chromium-mac',
+ 'chromium',
+ 'mac-leopard',
+ 'mac-snowleopard',
+ 'mac',
+ ],
+ 'snowleopard': [
+ 'chromium-mac',
+ 'chromium',
+ 'mac-snowleopard',
+ 'mac',
+ ],
+ 'future': [
+ 'chromium-mac',
+ 'chromium',
+ 'mac',
+ ],
+ }
+
+ FALLBACK_PATHS_CG = {
+ 'leopard': [
'chromium-cg-mac-leopard',
'chromium-cg-mac',
'chromium',
@@ -70,7 +92,7 @@
def __init__(self, port_name=None, os_version_string=None, **kwargs):
# We're a little generic here because this code is reused by the
# 'google-chrome' port as well as the 'mock-' and 'dryrun-' ports.
- port_name = port_name or 'chromium-cg-mac'
+ port_name = port_name or 'chromium-cg-mac' # FIXME: Change the default to chromium-mac once we're ready.
chromium.ChromiumPort.__init__(self, port_name=port_name, **kwargs)
if port_name.endswith('-mac'):
self._version = mac.os_version(os_version_string, self.SUPPORTED_OS_VERSIONS)
@@ -78,10 +100,14 @@
else:
self._version = port_name[port_name.index('-mac-') + len('-mac-'):]
assert self._version in self.SUPPORTED_OS_VERSIONS
+ self._using_core_graphics = port_name.find('-cg-') != -1
self._operating_system = 'mac'
def baseline_search_path(self):
- return map(self._webkit_baseline_path, self.FALLBACK_PATHS[self._version])
+ fallback_paths = self.FALLBACK_PATHS
+ if self._using_core_graphics:
+ fallback_paths = self.FALLBACK_PATHS_CG
+ return map(self._webkit_baseline_path, fallback_paths[self._version])
def check_build(self, needs_http):
result = chromium.ChromiumPort.check_build(self, needs_http)
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/factory.py (94030 => 94031)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/factory.py 2011-08-29 23:37:25 UTC (rev 94030)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/factory.py 2011-08-29 23:39:51 UTC (rev 94031)
@@ -86,6 +86,7 @@
elif sys.platform == 'darwin':
if options and hasattr(options, 'chromium') and options.chromium:
port_to_use = 'chromium-cg-mac'
+ # FIXME: Add a way to select the chromium-mac port.
else:
port_to_use = 'mac'
@@ -116,7 +117,7 @@
elif port_to_use.startswith('chromium-gpu'):
import chromium_gpu
maker = chromium_gpu.get
- elif port_to_use.startswith('chromium-cg-mac'):
+ elif port_to_use.startswith('chromium-mac') or port_to_use.startswith('chromium-cg-mac'):
import chromium_mac
maker = chromium_mac.ChromiumMacPort
elif port_to_use.startswith('chromium-linux'):
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/factory_unittest.py (94030 => 94031)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/factory_unittest.py 2011-08-29 23:37:25 UTC (rev 94030)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/factory_unittest.py 2011-08-29 23:39:51 UTC (rev 94031)
@@ -125,6 +125,7 @@
self.assert_port("chromium-gpu-win", chromium_gpu.ChromiumGpuWinPort)
def test_chromium_mac(self):
+ self.assert_port("chromium-mac", chromium_mac.ChromiumMacPort)
self.assert_port("chromium-cg-mac", chromium_mac.ChromiumMacPort)
self.assert_platform_port("darwin", self.chromium_options,
chromium_mac.ChromiumMacPort)
Modified: trunk/Tools/Scripts/webkitpy/to_be_moved/rebaseline_chromium_webkit_tests.py (94030 => 94031)
--- trunk/Tools/Scripts/webkitpy/to_be_moved/rebaseline_chromium_webkit_tests.py 2011-08-29 23:37:25 UTC (rev 94030)
+++ trunk/Tools/Scripts/webkitpy/to_be_moved/rebaseline_chromium_webkit_tests.py 2011-08-29 23:39:51 UTC (rev 94031)
@@ -68,8 +68,10 @@
'chromium-win-win7': 'Webkit_Win7',
'chromium-win-vista': 'Webkit_Vista',
'chromium-win-xp': 'Webkit_Win',
- 'chromium-cg-mac-leopard': 'Webkit_Mac10_5',
- 'chromium-cg-mac-snowleopard': 'Webkit_Mac10_6',
+ 'chromium-mac-leopard': 'Webkit_Mac10_5',
+ 'chromium-mac-snowleopard': 'Webkit_Mac10_6',
+ 'chromium-cg-mac-leopard': 'Webkit_Mac10_5__CG_',
+ 'chromium-cg-mac-snowleopard': 'Webkit_Mac10_6__CG_',
'chromium-linux-x86': 'Webkit_Linux_32',
'chromium-linux-x86_64': 'Webkit_Linux',
'chromium-gpu-mac-snowleopard': 'Webkit_Mac10_6_-_GPU',
Modified: trunk/Tools/Scripts/webkitpy/to_be_moved/rebaseline_chromium_webkit_tests_unittest.py (94030 => 94031)
--- trunk/Tools/Scripts/webkitpy/to_be_moved/rebaseline_chromium_webkit_tests_unittest.py 2011-08-29 23:37:25 UTC (rev 94030)
+++ trunk/Tools/Scripts/webkitpy/to_be_moved/rebaseline_chromium_webkit_tests_unittest.py 2011-08-29 23:39:51 UTC (rev 94031)
@@ -84,6 +84,8 @@
urls = {
ARCHIVE_URL + '/Webkit_Mac10_6/': '<a href=""
ARCHIVE_URL + '/Webkit_Mac10_5/': '<a href="" href=""
+ ARCHIVE_URL + '/Webkit_Mac10_6__CG_/': '<a href=""
+ ARCHIVE_URL + '/Webkit_Mac10_5__CG_/': '<a href="" href=""
ARCHIVE_URL + '/Webkit_Win7/': '<a href=""
ARCHIVE_URL + '/Webkit_Vista/': '<a href=""
ARCHIVE_URL + '/Webkit_Win/': '<a href=""
@@ -107,6 +109,19 @@
'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_Mac10_5__CG_/2/layout-test-results.zip': {
+ 'layout-test-results/failures/expected/image-actual.txt': 'new-image-txt',
+ 'layout-test-results/failures/expected/image-actual.checksum': 'new-image-checksum',
+ 'layout-test-results/failures/expected/image-actual.png': 'new-image-png',
+ 'layout-test-results/failures/expected/image_checksum-actual.txt': 'png-comment-txt',
+ 'layout-test-results/failures/expected/image_checksum-actual.checksum': '0123456789',
+ 'layout-test-results/failures/expected/image_checksum-actual.png': 'tEXtchecksum\x000123456789',
+ },
+ ARCHIVE_URL + '/Webkit_Mac10_6__CG_/4/layout-test-results.zip': {
+ 'layout-test-results/failures/expected/image-actual.txt': 'new-image-txt',
+ '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': {
'layout-test-results/failures/expected/image-actual.txt': 'win-image-txt',
'layout-test-results/failures/expected/image-actual.checksum': 'win-image-checksum',
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py (94030 => 94031)
--- trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py 2011-08-29 23:37:25 UTC (rev 94030)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py 2011-08-29 23:39:51 UTC (rev 94031)
@@ -68,6 +68,12 @@
Retrieving results for chromium-linux-x86_64 from Webkit Linux.
userscripts/another-test.html
userscripts/images.svg
+Retrieving results for chromium-mac-leopard from Webkit Mac10.5.
+ userscripts/another-test.html
+ userscripts/images.svg
+Retrieving results for chromium-mac-snowleopard from Webkit Mac10.6.
+ userscripts/another-test.html
+ userscripts/images.svg
Retrieving results for chromium-win-vista from Webkit Vista.
userscripts/another-test.html
userscripts/images.svg
@@ -88,6 +94,10 @@
MOCK run_command: ['echo', 'rebaseline-test', 'Webkit Linux 32', 'userscripts/images.svg'], cwd=/mock-checkout
MOCK run_command: ['echo', 'rebaseline-test', 'Webkit Linux', 'userscripts/another-test.html'], cwd=/mock-checkout
MOCK run_command: ['echo', 'rebaseline-test', 'Webkit Linux', 'userscripts/images.svg'], cwd=/mock-checkout
+MOCK run_command: ['echo', 'rebaseline-test', 'Webkit Mac10.5', 'userscripts/another-test.html'], cwd=/mock-checkout
+MOCK run_command: ['echo', 'rebaseline-test', 'Webkit Mac10.5', 'userscripts/images.svg'], cwd=/mock-checkout
+MOCK run_command: ['echo', 'rebaseline-test', 'Webkit Mac10.6', 'userscripts/another-test.html'], cwd=/mock-checkout
+MOCK run_command: ['echo', 'rebaseline-test', 'Webkit Mac10.6', 'userscripts/images.svg'], cwd=/mock-checkout
MOCK run_command: ['echo', 'rebaseline-test', 'Webkit Vista', 'userscripts/another-test.html'], cwd=/mock-checkout
MOCK run_command: ['echo', 'rebaseline-test', 'Webkit Vista', 'userscripts/images.svg'], cwd=/mock-checkout
MOCK run_command: ['echo', 'rebaseline-test', 'Webkit Win7', 'userscripts/another-test.html'], cwd=/mock-checkout
