Fix return code on Windows 8 machines.

tools/bots/compiler.py

 #!/usr/bin/python
 
 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """
 Dart2js buildbot steps
 
 Runs tests for the  dart2js compiler.
@@ skipping 117 matching lines @@
 
     print 'running %s' % (' '.join(cmd))
     bot.RunProcess(cmd)
 
 
 def TestCompiler(runtime, mode, system, flags, is_buildbot, test_set):
   """ test the compiler.
    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.
      - test_set: Specification of a non standard test set, default None
   """
 
   if system.startswith('win') and runtime.startswith('ie'):
     # There should not be more than one InternetExplorerDriver instance
     # running at a time. For details, see
     # http://code.google.com/p/selenium/wiki/InternetExplorerDriver.
@@ skipping 18 matching lines @@
           'Local', 'Google', 'Chrome', 'Application', 'chrome.exe')}
     return path_dict[runtime]
 
   if system == 'linux' and runtime == 'chrome':
     # TODO(ngeoffray): We should install selenium on the buildbot.
     runtime = 'drt'
   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).
     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,
         stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
     output, stderr = p.communicate()
     output = output.split()
     try:
       print 'Version of %s: %s' % (runtime, output[-1])
     except IndexError:
       # Failed to obtain version information. Continue running tests.
@@ skipping 42 matching lines @@
   clear out the temp files, so we do so explicitly here. Our batch browser
   testing will make this problem occur much less frequently, but will still
   happen eventually unless we do this.
 
   This problem also occurs with batch tests in Firefox. For some reason selenium
   automatically deletes the temporary profiles for Firefox for one browser,
   but not multiple ones when we have many open batch tasks running. This
   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':
     # Note: the buildbots run as root, so we can do this without requiring a
     # password. The command won't actually work on regular machines without
     # root permissions.
     _DeleteTempWebdriverProfiles('/tmp')
     _DeleteTempWebdriverProfiles('/var/tmp')
 
 
 def GetHasHardCodedCheckedMode(build_info):
   # TODO(ricow): We currently run checked mode tests on chrome on linux and
   # on the slow (all) IE windows bots. This is a hack and we should use the
   # normal sharding and checked splitting functionality when we get more
   # 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" kind of imply Windows?

[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
 
 
 def RunCompilerTests(build_info):
   test_flags = []
   if build_info.shard_index:
     test_flags = ['--shards=%s' % build_info.total_shards,
                   '--shard=%s' % build_info.shard_index]
 
   if build_info.checked: test_flags += ['--checked']
 
   if build_info.host_checked: test_flags += ['--host-checked']
 
   TestCompiler(build_info.runtime, build_info.mode, build_info.system,
                list(test_flags), build_info.is_buildbot, build_info.test_set)
 
   # See comment in GetHasHardCodedCheckedMode, this is a hack.
   if (GetHasHardCodedCheckedMode(build_info)):
     TestCompiler(build_info.runtime, build_info.mode, build_info.system,
                  test_flags + ['--checked'], build_info.is_buildbot,
                  build_info.test_set)
 
   if build_info.runtime != 'd8':
     CleanUpTemporaryFiles(build_info.system, build_info.runtime)
 
 
 if __name__ == '__main__':
   bot.RunBot(GetBuildInfo, RunCompilerTests)