Attachment #146976 for bug #88824

View | Details | Raw Unified | Return to bug 88824
Collapse All | Expand All




2012-06-11  Dirk Pranke  <dpranke@chromium.org>

        nrwt: remove the 'google-chrome' port code
        https://bugs.webkit.org/show_bug.cgi?id=88824

        Reviewed by NOBODY (OOPS!).

        NRWT now supports passing additional baseline directories
        and expectations files on the command line, so there's no need
        to support the concept of a 'google-chrome' port directly.

        * Scripts/webkitpy/layout_tests/port/base.py:
        (Port.path_to_test_expectations_file):
        * Scripts/webkitpy/layout_tests/port/builders.py:
        * Scripts/webkitpy/layout_tests/port/chromium_mac.py:
        (ChromiumMacPort.__init__):
        * Scripts/webkitpy/layout_tests/port/chromium_win.py:
        (ChromiumWinPort.__init__):
        * Scripts/webkitpy/layout_tests/port/factory.py:
        (PortFactory):
        * Scripts/webkitpy/layout_tests/port/factory_unittest.py:
        (FactoryTest.test_win):
        * Scripts/webkitpy/layout_tests/port/google_chrome.py: Removed.
        * Scripts/webkitpy/layout_tests/port/google_chrome_unittest.py: Removed.

2012-06-11  David Dorwin  <ddorwin@chromium.org>

        [chromium] Provide access to the WebPlugin created by the helper plugin widget

Lines 691-697 class Port(object): Link Here

(-)a/Tools/Scripts/webkitpy/layout_tests/port/base.py (-1 / +1 lines)
691		691
692	# test_expectations are always in mac/ not mac-leopard/ by convention, hence we use port_name instead of name().	692	# test_expectations are always in mac/ not mac-leopard/ by convention, hence we use port_name instead of name().
693	port_name = self.port_name	693	port_name = self.port_name
694	if port_name.startswith('chromium') or port_name.startswith('google-chrome'):	694	if port_name.startswith('chromium'):
695	port_name = 'chromium'	695	port_name = 'chromium'
696		696
697	baseline_path = self._webkit_baseline_path(port_name)	697	baseline_path = self._webkit_baseline_path(port_name)

Lines 79-86 _fuzzy_matches = { Link Here

(-)a/Tools/Scripts/webkitpy/layout_tests/port/builders.py (-2 lines)
79		79
80		80
81	_ports_without_builders = [	81	_ports_without_builders = [
82	"google-chrome-linux32",
83	"google-chrome-linux64",
84	"qt-mac",	82	"qt-mac",
85	"qt-win",	83	"qt-win",
86	"qt-wk2",	84	"qt-wk2",

Lines 78-87 class ChromiumMacPort(chromium.ChromiumPort): Link Here

(-)a/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac.py (-4 / +1 lines)
78		78
79	def __init__(self, host, port_name, **kwargs):	79	def __init__(self, host, port_name, **kwargs):
80	chromium.ChromiumPort.__init__(self, host, port_name, **kwargs)	80	chromium.ChromiumPort.__init__(self, host, port_name, **kwargs)
81		81	self._version = port_name[port_name.index('chromium-mac-') + len('chromium-mac-'):]
82	# We're a little generic here because this code is reused by the
83	# 'google-chrome' port as well as the 'mock-' and 'dryrun-' ports.
84	self._version = port_name[port_name.index('-mac-') + len('-mac-'):]
85	assert self._version in self.SUPPORTED_OS_VERSIONS	82	assert self._version in self.SUPPORTED_OS_VERSIONS
86		83
87	def baseline_search_path(self):	84	def baseline_search_path(self):

Lines 81-90 class ChromiumWinPort(chromium.ChromiumPort): Link Here

(-)a/Tools/Scripts/webkitpy/layout_tests/port/chromium_win.py (-4 / +1 lines)
81		81
82	def __init__(self, host, port_name, **kwargs):	82	def __init__(self, host, port_name, **kwargs):
83	chromium.ChromiumPort.__init__(self, host, port_name, **kwargs)	83	chromium.ChromiumPort.__init__(self, host, port_name, **kwargs)
84		84	self._version = port_name[port_name.index('chromium-win-') + len('chromium-win-'):]
85	# We're a little generic here because this code is reused by the
86	# 'google-chrome' port as well as the 'mock-' and 'dryrun-' ports.
87	self._version = port_name[port_name.index('-win-') + len('-win-'):]
88	assert self._version in self.SUPPORTED_VERSIONS, "%s is not in %s" % (self._version, self.SUPPORTED_VERSIONS)	85	assert self._version in self.SUPPORTED_VERSIONS, "%s is not in %s" % (self._version, self.SUPPORTED_VERSIONS)
89		86
90	def setup_environ_for_server(self, server_name=None):	87	def setup_environ_for_server(self, server_name=None):

Lines 69-78 class PortFactory(object): Link Here

(-)a/Tools/Scripts/webkitpy/layout_tests/port/factory.py (-4 lines)
69	'chromium_mac.ChromiumMacPort',	69	'chromium_mac.ChromiumMacPort',
70	'chromium_win.ChromiumWinPort',	70	'chromium_win.ChromiumWinPort',
71	'efl.EflPort',	71	'efl.EflPort',
72	'google_chrome.GoogleChromeLinux32Port',
73	'google_chrome.GoogleChromeLinux64Port',
74	'google_chrome.GoogleChromeMacPort',
75	'google_chrome.GoogleChromeWinPort',
76	'gtk.GtkPort',	72	'gtk.GtkPort',
77	'mac.MacPort',	73	'mac.MacPort',
78	'mock_drt.MockDRTPort',	74	'mock_drt.MockDRTPort',




from webkitpy.layout_tests.port import chromium_mac
from webkitpy.layout_tests.port import chromium_win
from webkitpy.layout_tests.port import factory
from webkitpy.layout_tests.port import google_chrome
from webkitpy.layout_tests.port import gtk
from webkitpy.layout_tests.port import mac
from webkitpy.layout_tests.port import qt

        self.assert_port(port_name=None, os_name='win', os_version='xp', cls=win.WinPort)
        self.assert_port(port_name=None, os_name='win', os_version='xp', options=self.webkit_options, cls=win.WinPort)

    def test_google_chrome(self):
        self.assert_port(port_name='google-chrome-linux32',
                         cls=google_chrome.GoogleChromeLinux32Port)
        self.assert_port(port_name='google-chrome-linux64', os_name='linux', os_version='lucid',
                         cls=google_chrome.GoogleChromeLinux64Port)
        self.assert_port(port_name='google-chrome-linux64',
                         cls=google_chrome.GoogleChromeLinux64Port)
        self.assert_port(port_name='google-chrome-win-xp',
                         cls=google_chrome.GoogleChromeWinPort)
        self.assert_port(port_name='google-chrome-win', os_name='win', os_version='xp',
                         cls=google_chrome.GoogleChromeWinPort)
        self.assert_port(port_name='google-chrome-win-xp', os_name='win', os_version='xp',
                         cls=google_chrome.GoogleChromeWinPort)
        self.assert_port(port_name='google-chrome-mac', os_name='mac', os_version='leopard',
                         cls=google_chrome.GoogleChromeMacPort)
        self.assert_port(port_name='google-chrome-mac-leopard', os_name='mac', os_version='leopard',
                         cls=google_chrome.GoogleChromeMacPort)
        self.assert_port(port_name='google-chrome-mac-leopard',
                         cls=google_chrome.GoogleChromeMacPort)

    def test_gtk(self):
        self.assert_port(port_name='gtk', cls=gtk.GtkPort)





#!/usr/bin/env python
# Copyright (C) 2010 Google Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
#
#     * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#     * Redistributions in binary form must reproduce the above
# copyright notice, this list of conditions and the following disclaimer
# in the documentation and/or other materials provided with the
# distribution.

# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

import chromium_linux
import chromium_mac
import chromium_win


def _test_expectations_overrides(port, super):
    # The chrome ports use the regular overrides plus anything in the
    # official test_expectations as well. Hopefully we don't get collisions.
    chromium_overrides = super.test_expectations_overrides(port)

    # FIXME: It used to be that AssertionError would get raised by
    # path_from_chromium_base() if we weren't in a Chromium checkout, but
    # this changed in r60427. This should probably be changed back.
    overrides_path = port.path_from_chromium_base('webkit', 'tools',
            'layout_tests', 'test_expectations_chrome.txt')
    if not port._filesystem.exists(overrides_path):
        return chromium_overrides

    chromium_overrides = chromium_overrides or ''
    return chromium_overrides + port._filesystem.read_text_file(overrides_path)


class GoogleChromeLinux32Port(chromium_linux.ChromiumLinuxPort):
    port_name = 'google-chrome-linux32'

    # FIXME: Make google-chrome-XXX work as a port name.
    @classmethod
    def determine_full_port_name(cls, host, options, port_name):
        return 'chromium-linux-x86'

    def baseline_search_path(self):
        paths = chromium_linux.ChromiumLinuxPort.baseline_search_path(self)
        paths.insert(0, self._webkit_baseline_path('google-chrome-linux32'))
        return paths

    def test_expectations_overrides(self):
        return _test_expectations_overrides(self, chromium_linux.ChromiumLinuxPort)

    def architecture(self):
        return 'x86'


class GoogleChromeLinux64Port(chromium_linux.ChromiumLinuxPort):
    port_name = 'google-chrome-linux64'

    # FIXME: Make google-chrome-XXX work as a port name.
    @classmethod
    def determine_full_port_name(cls, host, options, port_name):
        return 'chromium-linux-x86_64'

    def baseline_search_path(self):
        paths = chromium_linux.ChromiumLinuxPort.baseline_search_path(self)
        paths.insert(0, self._webkit_baseline_path('google-chrome-linux64'))
        return paths

    def test_expectations_overrides(self):
        return _test_expectations_overrides(self, chromium_linux.ChromiumLinuxPort)

    def architecture(self):
        return 'x86_64'


class GoogleChromeMacPort(chromium_mac.ChromiumMacPort):
    port_name = 'google-chrome-mac'

    # FIXME: Make google-chrome-XXX work as a port name.
    @classmethod
    def determine_full_port_name(cls, host, options, port_name):
        return 'chromium-mac-snowleopard'

    def baseline_search_path(self):
        paths = chromium_mac.ChromiumMacPort.baseline_search_path(self)
        paths.insert(0, self._webkit_baseline_path('google-chrome-mac'))
        return paths

    def test_expectations_overrides(self):
        return _test_expectations_overrides(self, chromium_mac.ChromiumMacPort)


class GoogleChromeWinPort(chromium_win.ChromiumWinPort):
    port_name = 'google-chrome-win'

    # FIXME: Make google-chrome-XXX work as a port name.
    @classmethod
    def determine_full_port_name(cls, host, options, port_name):
        return 'chromium-win-win7'

    def baseline_search_path(self):
        paths = chromium_win.ChromiumWinPort.baseline_search_path(self)
        paths.insert(0, self._webkit_baseline_path('google-chrome-win'))
        return paths

    def test_expectations_overrides(self):
        return _test_expectations_overrides(self, chromium_win.ChromiumWinPort)




#!/usr/bin/env python
# Copyright (C) 2010 Google Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
#
#     * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#     * Redistributions in binary form must reproduce the above
# copyright notice, this list of conditions and the following disclaimer
# in the documentation and/or other materials provided with the
# distribution.

# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

import unittest

from webkitpy.common.system.systemhost_mock import MockSystemHost
from webkitpy.layout_tests.port.factory import PortFactory


class TestGoogleChromePort(unittest.TestCase):
    def _verify_baseline_search_path_startswith(self, port_name, expected_platform_dirs):
        port = PortFactory(MockSystemHost()).get(port_name=port_name)
        actual_platform_dirs = [port._filesystem.basename(path) for path in port.baseline_search_path()]
        self.assertEqual(expected_platform_dirs, actual_platform_dirs[0:len(expected_platform_dirs)])

    def _verify_expectations_overrides(self, port_name):
        host = MockSystemHost()
        chromium_port = PortFactory(host).get("chromium-mac-leopard")
        chromium_base = chromium_port.path_from_chromium_base()
        port = PortFactory(host).get(port_name=port_name, options=None)

        expected_chromium_overrides = '// chromium overrides\n'
        expected_chrome_overrides = '// chrome overrides\n'
        chromium_path = host.filesystem.join(chromium_base, 'webkit', 'tools', 'layout_tests', 'test_expectations.txt')
        chrome_path = host.filesystem.join(chromium_base, 'webkit', 'tools', 'layout_tests', 'test_expectations_chrome.txt')

        host.filesystem.files[chromium_path] = expected_chromium_overrides
        host.filesystem.files[chrome_path] = None
        actual_chrome_overrides = port.test_expectations_overrides()
        self.assertEqual(expected_chromium_overrides, actual_chrome_overrides)

        host.filesystem.files[chrome_path] = expected_chrome_overrides
        actual_chrome_overrides = port.test_expectations_overrides()
        self.assertEqual(actual_chrome_overrides, expected_chromium_overrides + expected_chrome_overrides)

    def test_get_google_chrome_port(self):
        self._verify_baseline_search_path_startswith('google-chrome-linux32', ['google-chrome-linux32', 'chromium-linux-x86'])
        self._verify_baseline_search_path_startswith('google-chrome-linux64', ['google-chrome-linux64', 'chromium-linux'])
        self._verify_baseline_search_path_startswith('google-chrome-mac', ['google-chrome-mac', 'chromium-mac-snowleopard'])
        self._verify_baseline_search_path_startswith('google-chrome-win', ['google-chrome-win', 'chromium-win'])

        self._verify_expectations_overrides('google-chrome-mac')
        self._verify_expectations_overrides('google-chrome-win')
        self._verify_expectations_overrides('google-chrome-linux32')
        self._verify_expectations_overrides('google-chrome-linux64')

    def test_path_to_expectations(self):
        port_factory = PortFactory(MockSystemHost())
        for port_name in ('google-chrome-linux32', 'google-chrome-linux64', 'google-chrome-mac', 'google-chrome-win'):
            self.assertTrue(port_factory.get(port_name).path_to_test_expectations_file().endswith('platform/chromium/TestExpectations'))


if __name__ == '__main__':
    unittest.main()

Return to bug 88824

Lines 1-3 Link Here

(-)a/Tools/ChangeLog (+25 lines)
		1	2012-06-11 Dirk Pranke <dpranke@chromium.org>
		2
		3	nrwt: remove the 'google-chrome' port code
		4	https://bugs.webkit.org/show_bug.cgi?id=88824
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	NRWT now supports passing additional baseline directories
		9	and expectations files on the command line, so there's no need
		10	to support the concept of a 'google-chrome' port directly.
		11
		12	* Scripts/webkitpy/layout_tests/port/base.py:
		13	(Port.path_to_test_expectations_file):
		14	* Scripts/webkitpy/layout_tests/port/builders.py:
		15	* Scripts/webkitpy/layout_tests/port/chromium_mac.py:
		16	(ChromiumMacPort.__init__):
		17	* Scripts/webkitpy/layout_tests/port/chromium_win.py:
		18	(ChromiumWinPort.__init__):
		19	* Scripts/webkitpy/layout_tests/port/factory.py:
		20	(PortFactory):
		21	* Scripts/webkitpy/layout_tests/port/factory_unittest.py:
		22	(FactoryTest.test_win):
		23	* Scripts/webkitpy/layout_tests/port/google_chrome.py: Removed.
		24	* Scripts/webkitpy/layout_tests/port/google_chrome_unittest.py: Removed.
		25
1	2012-06-11 David Dorwin <ddorwin@chromium.org>	26	2012-06-11 David Dorwin <ddorwin@chromium.org>
2		27
3	[chromium] Provide access to the WebPlugin created by the helper plugin widget	28	[chromium] Provide access to the WebPlugin created by the helper plugin widget

Lines 35-41 from webkitpy.layout_tests.port import chromium_linux Link Here

(-)a/Tools/Scripts/webkitpy/layout_tests/port/factory_unittest.py (-21 lines)
35	from webkitpy.layout_tests.port import chromium_mac	35	from webkitpy.layout_tests.port import chromium_mac
36	from webkitpy.layout_tests.port import chromium_win	36	from webkitpy.layout_tests.port import chromium_win
37	from webkitpy.layout_tests.port import factory	37	from webkitpy.layout_tests.port import factory
38	from webkitpy.layout_tests.port import google_chrome
39	from webkitpy.layout_tests.port import gtk	38	from webkitpy.layout_tests.port import gtk
40	from webkitpy.layout_tests.port import mac	39	from webkitpy.layout_tests.port import mac
41	from webkitpy.layout_tests.port import qt	40	from webkitpy.layout_tests.port import qt
Lines 69-94 class FactoryTest(unittest.TestCase): Link Here
69	self.assert_port(port_name=None, os_name='win', os_version='xp', cls=win.WinPort)	68	self.assert_port(port_name=None, os_name='win', os_version='xp', cls=win.WinPort)
70	self.assert_port(port_name=None, os_name='win', os_version='xp', options=self.webkit_options, cls=win.WinPort)	69	self.assert_port(port_name=None, os_name='win', os_version='xp', options=self.webkit_options, cls=win.WinPort)
71		70
72	def test_google_chrome(self):
73	self.assert_port(port_name='google-chrome-linux32',
74	cls=google_chrome.GoogleChromeLinux32Port)
75	self.assert_port(port_name='google-chrome-linux64', os_name='linux', os_version='lucid',
76	cls=google_chrome.GoogleChromeLinux64Port)
77	self.assert_port(port_name='google-chrome-linux64',
78	cls=google_chrome.GoogleChromeLinux64Port)
79	self.assert_port(port_name='google-chrome-win-xp',
80	cls=google_chrome.GoogleChromeWinPort)
81	self.assert_port(port_name='google-chrome-win', os_name='win', os_version='xp',
82	cls=google_chrome.GoogleChromeWinPort)
83	self.assert_port(port_name='google-chrome-win-xp', os_name='win', os_version='xp',
84	cls=google_chrome.GoogleChromeWinPort)
85	self.assert_port(port_name='google-chrome-mac', os_name='mac', os_version='leopard',
86	cls=google_chrome.GoogleChromeMacPort)
87	self.assert_port(port_name='google-chrome-mac-leopard', os_name='mac', os_version='leopard',
88	cls=google_chrome.GoogleChromeMacPort)
89	self.assert_port(port_name='google-chrome-mac-leopard',
90	cls=google_chrome.GoogleChromeMacPort)
91
92	def test_gtk(self):	71	def test_gtk(self):
93	self.assert_port(port_name='gtk', cls=gtk.GtkPort)	72	self.assert_port(port_name='gtk', cls=gtk.GtkPort)
94		73

Lines 1-120 Link Here

(-)a/Tools/Scripts/webkitpy/layout_tests/port/google_chrome.py (-120 lines)
1	#!/usr/bin/env python
2	# Copyright (C) 2010 Google Inc. All rights reserved.
3	#
4	# Redistribution and use in source and binary forms, with or without
5	# modification, are permitted provided that the following conditions are
6	# met:
7	#
8	# * Redistributions of source code must retain the above copyright
9	# notice, this list of conditions and the following disclaimer.
10	# * Redistributions in binary form must reproduce the above
11	# copyright notice, this list of conditions and the following disclaimer
12	# in the documentation and/or other materials provided with the
13	# distribution.
14
15	# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
16	# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
17	# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
18	# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
19	# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
20	# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
21	# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
22	# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
23	# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24	# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
25	# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26
27	import chromium_linux
28	import chromium_mac
29	import chromium_win
30
31
32	def _test_expectations_overrides(port, super):
33	# The chrome ports use the regular overrides plus anything in the
34	# official test_expectations as well. Hopefully we don't get collisions.
35	chromium_overrides = super.test_expectations_overrides(port)
36
37	# FIXME: It used to be that AssertionError would get raised by
38	# path_from_chromium_base() if we weren't in a Chromium checkout, but
39	# this changed in r60427. This should probably be changed back.
40	overrides_path = port.path_from_chromium_base('webkit', 'tools',
41	'layout_tests', 'test_expectations_chrome.txt')
42	if not port._filesystem.exists(overrides_path):
43	return chromium_overrides
44
45	chromium_overrides = chromium_overrides or ''
46	return chromium_overrides + port._filesystem.read_text_file(overrides_path)
47
48
49	class GoogleChromeLinux32Port(chromium_linux.ChromiumLinuxPort):
50	port_name = 'google-chrome-linux32'
51
52	# FIXME: Make google-chrome-XXX work as a port name.
53	@classmethod
54	def determine_full_port_name(cls, host, options, port_name):
55	return 'chromium-linux-x86'
56
57	def baseline_search_path(self):
58	paths = chromium_linux.ChromiumLinuxPort.baseline_search_path(self)
59	paths.insert(0, self._webkit_baseline_path('google-chrome-linux32'))
60	return paths
61
62	def test_expectations_overrides(self):
63	return _test_expectations_overrides(self, chromium_linux.ChromiumLinuxPort)
64
65	def architecture(self):
66	return 'x86'
67
68
69	class GoogleChromeLinux64Port(chromium_linux.ChromiumLinuxPort):
70	port_name = 'google-chrome-linux64'
71
72	# FIXME: Make google-chrome-XXX work as a port name.
73	@classmethod
74	def determine_full_port_name(cls, host, options, port_name):
75	return 'chromium-linux-x86_64'
76
77	def baseline_search_path(self):
78	paths = chromium_linux.ChromiumLinuxPort.baseline_search_path(self)
79	paths.insert(0, self._webkit_baseline_path('google-chrome-linux64'))
80	return paths
81
82	def test_expectations_overrides(self):
83	return _test_expectations_overrides(self, chromium_linux.ChromiumLinuxPort)
84
85	def architecture(self):
86	return 'x86_64'
87
88
89	class GoogleChromeMacPort(chromium_mac.ChromiumMacPort):
90	port_name = 'google-chrome-mac'
91
92	# FIXME: Make google-chrome-XXX work as a port name.
93	@classmethod
94	def determine_full_port_name(cls, host, options, port_name):
95	return 'chromium-mac-snowleopard'
96
97	def baseline_search_path(self):
98	paths = chromium_mac.ChromiumMacPort.baseline_search_path(self)
99	paths.insert(0, self._webkit_baseline_path('google-chrome-mac'))
100	return paths
101
102	def test_expectations_overrides(self):
103	return _test_expectations_overrides(self, chromium_mac.ChromiumMacPort)
104
105
106	class GoogleChromeWinPort(chromium_win.ChromiumWinPort):
107	port_name = 'google-chrome-win'
108
109	# FIXME: Make google-chrome-XXX work as a port name.
110	@classmethod
111	def determine_full_port_name(cls, host, options, port_name):
112	return 'chromium-win-win7'
113
114	def baseline_search_path(self):
115	paths = chromium_win.ChromiumWinPort.baseline_search_path(self)
116	paths.insert(0, self._webkit_baseline_path('google-chrome-win'))
117	return paths
118
119	def test_expectations_overrides(self):
120	return _test_expectations_overrides(self, chromium_win.ChromiumWinPort)