Chromium Code Reviews| Index: utils/compiler/buildbot.py |
| =================================================================== |
| --- utils/compiler/buildbot.py (revision 9897) |
| +++ utils/compiler/buildbot.py (working copy) |
| @@ -223,10 +223,21 @@ |
| elif (runtime == 'ff' or runtime == 'chrome') and is_buildbot: |
| # Print out browser version numbers if we're running on the buildbot (where |
| # we know the paths to these browser installations). |
| - p = subprocess.Popen('%s --version' % GetPath(runtime), |
| + version_query_string = '%s --version' % GetPath(runtime) |
| + if runtime == 'ff' and system == 'win7': |
| + version_query_string += '| more' |
|
Siggi Cherem (dart-lang)
2012/07/26 00:50:11
I didn't know that '| more' was valid in win
|
| + elif runtime == 'chrome' and system == 'win7': |
| + version_query_string = ('''reg query "HKCU\\Software\\Microsoft\\''' + |
| + '''Windows\\CurrentVersion\\Uninstall\\Google Chrome" \\v Version''') |
|
Siggi Cherem (dart-lang)
2012/07/26 00:50:11
AAAH! wow...
|
| + p = subprocess.Popen(version_query_string, |
| stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True) |
| output, stderr = p.communicate() |
| - print 'Version of %s: %s' % (runtime, output) |
| + output = output.split() |
| + try: |
| + print 'Version of %s: %s' % (runtime, output[-1]) |
| + except IndexError: |
| + # Failed to obtain version information. Continue running tests. |
| + pass |
| if compiler == 'dart2js': |
| if option == 'checked': flags = flags + ['--host-checked'] |