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 90b2c5704e6607ce51271369bbcb2ecf5350577f..b4bdaf12731d51042acf69dc76ba1ed9e9e381d7 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 |
@@ -362,16 +362,22 @@ class TestPort(Port): |
port_name = 'test' |
default_port_name = 'test-mac-leopard' |
- """Test implementation of the Port interface.""" |
+ # TODO(wkorman): The below constant is legacy code and is only referenced by a unit test. Find the modern way to do |
+ # the same thing that test is doing and delete this. |
+ # |
+ # A list of platform names sufficient to cover all the baselines. |
+ # The list should be sorted so that a later platform will reuse |
+ # an earlier platform's baselines if they are the same (e.g., |
+ # 'mac10.10' should precede 'mac10.9'). |
ALL_BASELINE_VARIANTS = ( |
'test-linux-trusty', 'test-linux-precise', 'test-linux-x86', |
'test-mac-snowleopard', 'test-mac-leopard', |
- 'test-win-win7', 'test-win-xp', |
+ 'test-win-win10', 'test-win-win7' |
) |
FALLBACK_PATHS = { |
- 'xp': ['test-win-win7', 'test-win-xp'], |
- 'win7': ['test-win-win7'], |
+ 'win7': ['test-win-win7', 'test-win-win10'], |
+ 'win10': ['test-win-win10'], |
'leopard': ['test-mac-leopard', 'test-mac-snowleopard'], |
'snowleopard': ['test-mac-snowleopard'], |
'trusty': ['test-linux-trusty', 'test-win-win7'], |
@@ -409,8 +415,8 @@ class TestPort(Port): |
self._operating_system = 'linux' |
version_map = { |
- 'test-win-xp': 'xp', |
'test-win-win7': 'win7', |
+ 'test-win-win10': 'win10', |
'test-mac-leopard': 'leopard', |
'test-mac-snowleopard': 'snowleopard', |
'test-linux-x86': 'linux32', |
@@ -423,7 +429,7 @@ class TestPort(Port): |
self._architecture = 'x86_64' |
def buildbot_archives_baselines(self): |
- return self._name != 'test-win-xp' |
+ return self._name != 'test-win-win7' |
def default_pixel_tests(self): |
return True |
@@ -515,7 +521,7 @@ class TestPort(Port): |
return self._generic_expectations_path |
def _port_specific_expectations_files(self): |
- return [self._filesystem.join(self._webkit_baseline_path(d), 'TestExpectations') for d in ['test', 'test-win-xp']] |
+ return [self._filesystem.join(self._webkit_baseline_path(d), 'TestExpectations') for d in ['test', 'test-win-win7']] |
def all_test_configurations(self): |
"""Returns a sequence of the TestConfigurations the port supports.""" |
@@ -533,8 +539,8 @@ class TestPort(Port): |
def _all_systems(self): |
return (('leopard', 'x86'), |
('snowleopard', 'x86'), |
- ('xp', 'x86'), |
('win7', 'x86'), |
+ ('win10', 'x86'), |
('linux32', 'x86'), |
('precise', 'x86_64'), |
('trusty', 'x86_64')) |
@@ -546,13 +552,10 @@ class TestPort(Port): |
"""To avoid surprises when introducing new macros, these are intentionally fixed in time.""" |
return { |
'mac': ['leopard', 'snowleopard'], |
- 'win': ['xp', 'win7'], |
+ 'win': ['win7', 'win10'], |
'linux': ['linux32', 'precise', 'trusty'] |
} |
- def all_baseline_variants(self): |
- return self.ALL_BASELINE_VARIANTS |
- |
def virtual_test_suites(self): |
return [ |
VirtualTestSuite(prefix='virtual_passes', base='passes', args=['--virtual-arg']), |