| Index: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py
|
| diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py
|
| index c9e3e12c8b5d19b874414cf72e13c0f34927657a..104a311133982cae22c3ebe82ebeebe524f08584 100644
|
| --- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py
|
| +++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py
|
| @@ -103,7 +103,6 @@ class Port(object):
|
| ('mountainlion', 'x86'),
|
| ('mavericks', 'x86'),
|
| ('mac10.10', 'x86'),
|
| - ('xp', 'x86'),
|
| ('win7', 'x86'),
|
| ('win10', 'x86'),
|
| # FIXME: We handle 32bit Linux similarly to Mac retina above treating it
|
| @@ -116,15 +115,9 @@ class Port(object):
|
| ('icecreamsandwich', 'x86'),
|
| )
|
|
|
| - ALL_BASELINE_VARIANTS = [
|
| - 'mac-mac10.10', 'mac-mavericks', 'mac-retina', 'mac-mountainlion', 'mac-lion', 'mac-snowleopard',
|
| - 'win-win10', 'win-win7', 'win-xp'
|
| - 'linux-trusty', 'linux-precise', 'linux-x86',
|
| - ]
|
| -
|
| CONFIGURATION_SPECIFIER_MACROS = {
|
| 'mac': ['snowleopard', 'lion', 'mountainlion', 'retina', 'mavericks', 'mac10.10'],
|
| - 'win': ['xp', 'win7', 'win10'],
|
| + 'win': ['win7', 'win10'],
|
| 'linux': ['linux32', 'precise', 'trusty'],
|
| 'android': ['icecreamsandwich'],
|
| }
|
| @@ -226,6 +219,9 @@ class Port(object):
|
| self._results_directory = None
|
| self._virtual_test_suites = None
|
|
|
| + def __str__(self):
|
| + return "Port{name=%s, version=%s, architecture=%s, test_configuration=%s}" % (self._name, self._version, self._architecture, self._test_configuration)
|
| +
|
| def buildbot_archives_baselines(self):
|
| return True
|
|
|
| @@ -984,7 +980,7 @@ class Port(object):
|
|
|
| def version(self):
|
| """Returns a string indicating the version of a given platform, e.g.
|
| - 'leopard' or 'xp'.
|
| + 'leopard' or 'win7'.
|
|
|
| This is used to help identify the exact port when parsing test
|
| expectations, determining search paths, and logging information."""
|
| @@ -1260,21 +1256,13 @@ class Port(object):
|
| """Ports may provide a way to abbreviate configuration specifiers to conveniently
|
| refer to them as one term or alias specific values to more generic ones. For example:
|
|
|
| - (xp, vista, win7) -> win # Abbreviate all Windows versions into one namesake.
|
| + (vista, win7) -> win # Abbreviate all Windows versions into one namesake.
|
| (precise, trusty) -> linux # Change specific name of Linux distro to a more generic term.
|
|
|
| Returns a dictionary, each key representing a macro term ('win', for example),
|
| - and value being a list of valid configuration specifiers (such as ['xp', 'vista', 'win7'])."""
|
| + and value being a list of valid configuration specifiers (such as ['vista', 'win7'])."""
|
| return self.CONFIGURATION_SPECIFIER_MACROS
|
|
|
| - def all_baseline_variants(self):
|
| - """Returns 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')."""
|
| - return self.ALL_BASELINE_VARIANTS
|
| -
|
| def _generate_all_test_configurations(self):
|
| """Returns a sequence of the TestConfigurations the port supports."""
|
| # By default, we assume we want to test every graphics type in
|
|
|