Index: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/test.py |
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/test.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/test.py |
index ccd37dfed664224a532896865a1861be0de5eba8..7036bc9453e1d82935d0e57efe3cfa83e8d7f6ce 100644 |
--- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/test.py |
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/test.py |
@@ -388,6 +388,23 @@ class TestPort(Port): |
'linux32': ['test-linux-x86', 'test-linux-precise', 'test-linux-trusty', 'test-win-win7'], |
} |
+ _all_systems = (('mac10.10', 'x86'), |
+ ('mac10.11', 'x86'), |
+ ('win7', 'x86'), |
+ ('win10', 'x86'), |
+ ('linux32', 'x86'), |
+ ('precise', 'x86_64'), |
+ ('trusty', 'x86_64')) |
+ |
+ _all_build_types = ('debug', 'release') |
+ |
+ """To avoid surprises when introducing new macros, these are intentionally fixed in time.""" |
+ _configuration_specifier_macros = { |
+ 'mac': ['mac10.10', 'mac10.11'], |
+ 'win': ['win7', 'win10'], |
+ 'linux': ['linux32', 'precise', 'trusty'] |
+ } |
+ |
@classmethod |
def determine_full_port_name(cls, host, options, port_name): |
if port_name == 'test': |
@@ -528,33 +545,16 @@ class TestPort(Port): |
# By default, we assume we want to test every graphics type in |
# every configuration on every system. |
test_configurations = [] |
- for version, architecture in self._all_systems(): |
- for build_type in self._all_build_types(): |
+ for version, architecture in self._all_systems: |
+ for build_type in self._all_build_types: |
test_configurations.append(TestConfiguration( |
version=version, |
architecture=architecture, |
build_type=build_type)) |
return test_configurations |
- def _all_systems(self): |
- return (('mac10.10', 'x86'), |
- ('mac10.11', 'x86'), |
- ('win7', 'x86'), |
- ('win10', 'x86'), |
- ('linux32', 'x86'), |
- ('precise', 'x86_64'), |
- ('trusty', 'x86_64')) |
- |
- def _all_build_types(self): |
- return ('debug', 'release') |
- |
def configuration_specifier_macros(self): |
- """To avoid surprises when introducing new macros, these are intentionally fixed in time.""" |
- return { |
- 'mac': ['mac10.10', 'mac10.11'], |
- 'win': ['win7', 'win10'], |
- 'linux': ['linux32', 'precise', 'trusty'] |
- } |
+ return self._configuration_specifier_macros |
def virtual_test_suites(self): |
return [ |