| Index: Tools/Scripts/webkitpy/layout_tests/port/builders.py
|
| diff --git a/Tools/Scripts/webkitpy/layout_tests/port/builders.py b/Tools/Scripts/webkitpy/layout_tests/port/builders.py
|
| index be0daf6ec62341019838af368f8e4f85b4f710b5..8860cec67310df46527c6659573fa64770e90033 100644
|
| --- a/Tools/Scripts/webkitpy/layout_tests/port/builders.py
|
| +++ b/Tools/Scripts/webkitpy/layout_tests/port/builders.py
|
| @@ -41,34 +41,34 @@ from webkitpy.common.memoized import memoized
|
| # TestExpectationsParser._configuration_tokens_list
|
|
|
| _exact_matches = {
|
| - "WebKit XP": {"port_name": "win-xp", "specifiers": ['XP', 'Release']},
|
| - "WebKit Win7": {"port_name": "win-win7", "specifiers": ['Win7', 'Release']},
|
| - "WebKit Win7 (dbg)": {"port_name": "win-win7", "specifiers": ['Win7', 'Debug']},
|
| - "WebKit Linux": {"port_name": "linux-x86_64", "specifiers": ['Linux', 'Release']},
|
| - "WebKit Linux 32": {"port_name": "linux-x86", "specifiers": ['Linux', 'Release']},
|
| - "WebKit Linux (dbg)": {"port_name": "linux-x86_64", "specifiers": ['Linux', 'Debug']},
|
| - "WebKit Mac10.6": {"port_name": "mac-snowleopard", "specifiers": ['SnowLeopard', 'Release']},
|
| - "WebKit Mac10.6 (dbg)": {"port_name": "mac-snowleopard", "specifiers": ['SnowLeopard', 'Debug']},
|
| - "WebKit Mac10.7": {"port_name": "mac-lion", "specifiers": ['Lion', 'Release']},
|
| - "WebKit Mac10.7 (dbg)": {"port_name": "mac-lion", "specifiers": ['Lion', 'Debug']},
|
| - "WebKit Mac10.8": {"port_name": "mac-mountainlion", "specifiers": ['MountainLion', 'Release']},
|
| - "WebKit Mac10.8 (retina)": {"port_name": "mac-retina", "specifiers": ['Retina', 'Release']},
|
| - "WebKit Mac10.9": {"port_name": "mac-mavericks", "specifiers": ['Mavericks', 'Release']},
|
| - "WebKit Android (Nexus4)": {"port_name": "android", "specifiers": ['Android', 'Release']},
|
| + 'WebKit XP': {'port_name': 'win-xp', 'specifiers': ['XP', 'Release']},
|
| + 'WebKit Win7': {'port_name': 'win-win7', 'specifiers': ['Win7', 'Release']},
|
| + 'WebKit Win7 (dbg)': {'port_name': 'win-win7', 'specifiers': ['Win7', 'Debug']},
|
| + 'WebKit Linux': {'port_name': 'linux-x86_64', 'specifiers': ['Linux', 'Release']},
|
| + 'WebKit Linux 32': {'port_name': 'linux-x86', 'specifiers': ['Linux', 'Release']},
|
| + 'WebKit Linux (dbg)': {'port_name': 'linux-x86_64', 'specifiers': ['Linux', 'Debug']},
|
| + 'WebKit Mac10.6': {'port_name': 'mac-snowleopard', 'specifiers': ['SnowLeopard', 'Release']},
|
| + 'WebKit Mac10.6 (dbg)': {'port_name': 'mac-snowleopard', 'specifiers': ['SnowLeopard', 'Debug']},
|
| + 'WebKit Mac10.7': {'port_name': 'mac-lion', 'specifiers': ['Lion', 'Release']},
|
| + 'WebKit Mac10.7 (dbg)': {'port_name': 'mac-lion', 'specifiers': ['Lion', 'Debug']},
|
| + 'WebKit Mac10.8': {'port_name': 'mac-mountainlion', 'specifiers': ['MountainLion', 'Release']},
|
| + 'WebKit Mac10.8 (retina)': {'port_name': 'mac-retina', 'specifiers': ['Retina', 'Release']},
|
| + 'WebKit Mac10.9': {'port_name': 'mac-mavericks', 'specifiers': ['Mavericks', 'Release']},
|
| + 'WebKit Android (Nexus4)': {'port_name': 'android', 'specifiers': ['Android', 'Release']},
|
| }
|
|
|
|
|
| # Mapping from port name to the deps builder of the same os:
|
| _deps_builders = {
|
| - "linux-x86": "WebKit Linux (deps)",
|
| - "linux-x86_64": "WebKit Linux (deps)",
|
| - "win-xp": "WebKit XP (deps)",
|
| - "win-win7": "WebKit XP (deps)",
|
| - "mac-snowleopard": "WebKit Mac10.6 (deps)",
|
| - "mac-lion": "WebKit Mac10.6 (deps)",
|
| - "mac-mountainlion": "WebKit Mac10.6 (deps)",
|
| - "mac-mavericks": "WebKit Mac10.6 (deps)",
|
| - "mac-retina": "WebKit Mac10.6 (deps)",
|
| + 'linux-x86': 'WebKit Linux (deps)',
|
| + 'linux-x86_64': 'WebKit Linux (deps)',
|
| + 'win-xp': 'WebKit XP (deps)',
|
| + 'win-win7': 'WebKit XP (deps)',
|
| + 'mac-snowleopard': 'WebKit Mac10.6 (deps)',
|
| + 'mac-lion': 'WebKit Mac10.6 (deps)',
|
| + 'mac-mountainlion': 'WebKit Mac10.6 (deps)',
|
| + 'mac-mavericks': 'WebKit Mac10.6 (deps)',
|
| + 'mac-retina': 'WebKit Mac10.6 (deps)',
|
| }
|
|
|
|
|
| @@ -85,19 +85,19 @@ def all_builder_names():
|
|
|
|
|
| def all_port_names():
|
| - return sorted(set(map(lambda x: x["port_name"], _exact_matches.values()) + _ports_without_builders))
|
| + return sorted(set(map(lambda x: x['port_name'], _exact_matches.values()) + _ports_without_builders))
|
|
|
|
|
| def rebaseline_override_dir(builder_name):
|
| - return _exact_matches[builder_name].get("rebaseline_override_dir", None)
|
| + return _exact_matches[builder_name].get('rebaseline_override_dir', None)
|
|
|
|
|
| def port_name_for_builder_name(builder_name):
|
| - return _exact_matches[builder_name]["port_name"]
|
| + return _exact_matches[builder_name]['port_name']
|
|
|
|
|
| def specifiers_for_builder(builder_name):
|
| - return _exact_matches[builder_name]["specifiers"]
|
| + return _exact_matches[builder_name]['specifiers']
|
|
|
|
|
| def builder_name_for_port_name(target_port_name):
|
|
|