third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_configuration.py - Issue 1624373005: Remove XP port from Blink LayoutTest related scripts.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_configuration.py

Issue 1624373005: Remove XP port from Blink LayoutTest related scripts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Sync to head. Created 4 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_finder_unittest.py ('k') | third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_configuration_unittest.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_configuration.py

diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_configuration.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_configuration.py

index 2527c8f1eae4a2e4f297dc3760b079d1cf958387..2c8955e665cd1bc7479cd14825aefb028ef947d0 100644

--- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_configuration.py

+++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_configuration.py

@@ -258,7 +258,7 @@ class TestConfigurationConverter(object):

return False

# 2) Collapse specifier sets with common specifiers:

- # (xp, release), (xp, debug) --> (xp, x86)

+ # (win7, release), (win7, debug) --> (win7, x86)

for size, collapsing_sets in self._collapsing_sets_by_size.items():

while try_collapsing(size, collapsing_sets):

pass

@@ -278,19 +278,19 @@ class TestConfigurationConverter(object):

return False

# 3) Abbreviate specifier sets by combining specifiers across categories.

- # (xp, release), (win7, release) --> (xp, win7, release)

+ # (win7, release), (win10, release) --> (win7, win10, release)

while try_abbreviating(self._collapsing_sets_by_size.values()):

pass

# 4) Substitute specifier subsets that match macros witin each set:

- # (xp, win7, release) -> (win, release)

+ # (win7, win10, release) -> (win, release)

self.collapse_macros(self._configuration_macros, specifiers_list)

macro_keys = set(self._configuration_macros.keys())

# 5) Collapsing macros may have created combinations the can now be abbreviated.

- # (xp, release), (linux, x86, release), (linux, x86_64, release) --> (xp, release), (linux, release) --> (xp, linux, release)

+ # (win7, release), (linux, x86, release), (linux, x86_64, release) --> (win7, release), (linux, release) --> (win7, linux, release)

while try_abbreviating([self._collapsing_sets_by_category['version'] | macro_keys]):

pass