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

Unified Diff: tools/bots/compiler.py

Issue 11272022: Fix return code on Windows 8 machines. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 8 years, 2 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/bots/compiler.py
===================================================================
--- tools/bots/compiler.py (revision 14048)
+++ tools/bots/compiler.py (working copy)
@@ -135,7 +135,7 @@
Args:
- runtime: either 'd8', 'jsshell', or one of the browsers, see GetBuildInfo
- mode: either 'debug' or 'release'
- - system: either 'linux', 'mac', or 'win7'
+ - system: either 'linux', 'mac', 'win7', or 'win8'
- flags: extra flags to pass to test.dart
- is_buildbot: true if we are running on a real buildbot instead of
emulating one.
@@ -174,9 +174,9 @@
# Print out browser version numbers if we're running on the buildbot (where
# we know the paths to these browser installations).
version_query_string = '"%s" --version' % GetPath(runtime)
- if runtime == 'ff' and system == 'win7':
+ if runtime == 'ff' and system.startswith('win'):
version_query_string += '| more'
- elif runtime == 'chrome' and system == 'win7':
+ elif runtime == 'chrome' and system.startswith('win'):
version_query_string = ('''reg query "HKCU\\Software\\Microsoft\\''' +
'''Windows\\CurrentVersion\\Uninstall\\Google Chrome" /v Version''')
p = subprocess.Popen(version_query_string,
@@ -239,10 +239,10 @@
behavior has not been reproduced outside of the buildbots.
Args:
- - system: either 'linux', 'mac', or 'win7'
+ - system: either 'linux', 'mac', 'win7', or 'win8'
- browser: one of the browsers, see GetBuildInfo
"""
- if system == 'win7':
+ if system.startswith('win'):
shutil.rmtree('C:\\Users\\chrome-bot\\AppData\\Local\\Temp',
ignore_errors=True)
elif browser == 'ff' or 'opera':
@@ -260,8 +260,8 @@
# vms for testing this.
if (build_info.system == 'linux' and build_info.runtime == 'chrome'):
return True
- if (build_info.system == 'win7' and build_info.runtime.startswith('ie') and
- build_info.test_set == 'all'):
+ if (build_info.system.startswith('win') and
Bob Nystrom 2012/10/25 00:32:54 Is this clause needed? Doesn't checking for "ie" k
Emily Fortuna 2012/10/25 00:44:24 Fair enough. Removed.
+ build_info.runtime.startswith('ie') and build_info.test_set == 'all'):
return True
return False
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698