Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1975)

Unified Diff: Tools/Scripts/webkitpy/layout_tests/port/win.py

Issue 1286373004: Treat win8 machines as win10 ports and remove baseline/specifier support. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 4 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
Index: Tools/Scripts/webkitpy/layout_tests/port/win.py
diff --git a/Tools/Scripts/webkitpy/layout_tests/port/win.py b/Tools/Scripts/webkitpy/layout_tests/port/win.py
index 781c8da698357abb0dcc39b1a9b4231154d6f20a..373ceb8ce69a0d93824e42d2624c421472fce795 100644
--- a/Tools/Scripts/webkitpy/layout_tests/port/win.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/win.py
@@ -50,11 +50,10 @@ _log = logging.getLogger(__name__)
class WinPort(base.Port):
port_name = 'win'
- SUPPORTED_VERSIONS = ('xp', 'win7', 'win8', 'win10')
+ SUPPORTED_VERSIONS = ('xp', 'win7', 'win10')
FALLBACK_PATHS = {'win10': ['win']}
- FALLBACK_PATHS['win8'] = ['win8'] + FALLBACK_PATHS['win10']
- FALLBACK_PATHS['win7'] = ['win7'] + FALLBACK_PATHS['win8']
+ FALLBACK_PATHS['win7'] = ['win7'] + FALLBACK_PATHS['win10']
FALLBACK_PATHS['xp'] = ['win-xp'] + FALLBACK_PATHS['win7']
DEFAULT_BUILD_DIRECTORIES = ('build', 'out')
@@ -68,9 +67,8 @@ class WinPort(base.Port):
# We don't maintain separate baselines for vista, so we pretend it is win7.
if host.platform.os_version in ('vista', '7sp0', '7sp1'):
version = 'win7'
- elif host.platform.os_version in ('8', '8.1'):
- version = 'win8'
- elif host.platform.os_version in ('10', 'future'):
+ # Same for win8, we treat it as win10.
+ elif host.platform.os_version in ('8', '8.1', '10', 'future'):
version = 'win10'
else:
version = host.platform.os_version
« no previous file with comments | « Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py ('k') | Tools/Scripts/webkitpy/layout_tests/port/win_unittest.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698