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

Unified Diff: Tools/Scripts/webkitpy/common/system/platforminfo.py

Issue 1294603002: Add run-webkit-tests support and generate baselines for win8 and win10. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: remove 64 bit versions references 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
« no previous file with comments | « no previous file | Tools/Scripts/webkitpy/common/system/platforminfo_unittest.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Tools/Scripts/webkitpy/common/system/platforminfo.py
diff --git a/Tools/Scripts/webkitpy/common/system/platforminfo.py b/Tools/Scripts/webkitpy/common/system/platforminfo.py
index e47d5f142ed05db7878779bb5c3cfd52c8641e9c..15e17ee19178d7e3897d98455af0be8fee2734f2 100644
--- a/Tools/Scripts/webkitpy/common/system/platforminfo.py
+++ b/Tools/Scripts/webkitpy/common/system/platforminfo.py
@@ -164,13 +164,23 @@ class PlatformInfo(object):
return 'trusty' if version not in officially_supported_versions else version
def _determine_win_version(self, win_version_tuple):
+ if win_version_tuple[:2] == (10, 0):
+ return '10'
+ if win_version_tuple[:2] == (6, 3):
+ return '8.1'
+ if win_version_tuple[:2] == (6, 2):
+ return '8'
+ if win_version_tuple[:3] == (6, 1, 7601):
+ return '7sp1'
if win_version_tuple[:3] == (6, 1, 7600):
return '7sp0'
if win_version_tuple[:2] == (6, 0):
return 'vista'
if win_version_tuple[:2] == (5, 1):
return 'xp'
- assert win_version_tuple[0] > 6 or win_version_tuple[1] >= 1, 'Unrecognized Windows version tuple: "%s"' % (win_version_tuple,)
+ assert (win_version_tuple[0] > 10 or
+ win_version_tuple[0] == 10 and win_version_tuple[1] > 0), (
+ 'Unrecognized Windows version tuple: "%s"' % (win_version_tuple,))
return 'future'
def _win_version_tuple(self, sys_module):
« no previous file with comments | « no previous file | Tools/Scripts/webkitpy/common/system/platforminfo_unittest.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698