Refactor compiler annotated steps based on renaming of system from win7/8 to windows

tools/bots/compiler.py

 #!/usr/bin/python
 
 # Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 # for details. 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 63 matching lines @@
     if dart2js_pattern.group(8) == 'host-checked':
       host_checked = True
     if dart2js_pattern.group(10) == 'minified':
       minified = True
     shard_index = dart2js_pattern.group(11)
     total_shards = dart2js_pattern.group(12)
   else :
     return None
 
   # We have both win7 and win8 bots, functionality is the same.
-  if system.startsWith('win'):
+  if system.startswith('win'):
     system = 'windows'
 
   # We have both 10.8 and 10.7 bots, functionality is the same.
   if system == 'mac10.8' or system == 'mac10.7':
     system = 'mac'
 
-  if (system == 'win7' and platform.system() != 'Windows') or (
+  if (system == 'windows' and platform.system() != 'Windows') or (
       system == 'mac' and platform.system() != 'Darwin') or (
       system == 'linux' and platform.system() != 'Linux'):
     print ('Error: You cannot emulate a buildbot with a platform different '
         'from your own.')
     return None
   return bot.BuildInfo(compiler, runtime, mode, system, checked, host_checked,
                        minified, shard_index, total_shards, is_buildbot,
                        test_set, csp)
 
 
@@ skipping 79 matching lines @@
 
     print 'Running: %s' % (' '.join(map(lambda arg: '"%s"' % arg, 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', 'win7', or 'win8'
+     - system: either 'linux', 'mac', 'windows'
      - 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
   """
 
   def GetPath(runtime):
     """ Helper to get the path to the Chrome or Firefox executable for a
     particular platform on the buildbot. Throws a KeyError if runtime is not
     either 'chrome' or 'ff'."""
     if system == 'mac':
       partDict = {'chrome': 'Google\\ Chrome', 'ff': 'Firefox'}
       mac_path = '/Applications/%s.app/Contents/MacOS/%s'
       path_dict = {'chrome': mac_path % (partDict[runtime], partDict[runtime]),
           'ff': mac_path % (partDict[runtime], partDict[runtime].lower())}
     elif system == 'linux':
       path_dict = {'ff': 'firefox', 'chrome': 'google-chrome'}
     else:
       # Windows.
       path_dict = {'ff': os.path.join('C:/', 'Program Files (x86)',
           'Mozilla Firefox', 'firefox.exe'),
           'chrome': os.path.join('C:/', 'Users', 'chrome-bot', 'AppData',
           'Local', 'Google', 'Chrome', 'Application', 'chrome.exe')}
     return path_dict[runtime]
 
   if (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.startswith('win'):
+    if runtime == 'ff' and system == 'windows':
       version_query_string += '| more'
-    elif runtime == 'chrome' and system.startswith('win'):
+    elif runtime == 'chrome' and system == 'windows':
       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.
       pass
 
   if runtime == 'd8':
     # The dart2js compiler isn't self-hosted (yet) so we run its
     # unit tests on the VM. We avoid doing this on the builders
     # that run the browser tests to cut down on the cycle time.
     unit_test_flags = [flag for flag in flags if flag.startswith('--shard')]
     # Run the unit tests in checked mode (the VM's checked mode).
     unit_test_flags.append('--checked')
     TestStep("dart2js_unit", mode, system, 'none', 'vm', ['dart2js'],
              unit_test_flags)
 
-  if system.startswith('win') and runtime.startswith('ie10'):
+  if system == 'windows' and runtime == 'ie10':
     TestStep("dart2js", mode, system, 'dart2js', runtime, ['html'], flags)
   else:
     # Run the default set of test suites.
     TestStep("dart2js", mode, system, 'dart2js', runtime, [], flags)
 
     # TODO(kasperl): Consider running peg and css tests too.
     extras = ['dart2js_extra', 'dart2js_native', 'dart2js_foreign']
     extras_flags = flags
     if (system == 'linux'
         and runtime == 'd8'
@@ skipping 21 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', 'win7', or 'win8'
+     - system: either 'linux', 'mac', 'windows'
      - browser: one of the browsers, see GetBuildInfo
   """
-  if system.startswith('win'):
+  if system == 'windows':
     temp_dir = 'C:\\Users\\chrome-bot\\AppData\\Local\\Temp'
     for name in os.listdir(temp_dir):
       fullname = os.path.join(temp_dir, name)
       if os.path.isdir(fullname):
         shutil.rmtree(fullname, 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')
@@ skipping 77 matching lines @@
   """
   with bot.BuildStep('Build SDK and d8'):
     args = [sys.executable, './tools/build.py', '--mode=' + build_info.mode,
             'dart2js_bot']
     print 'Build SDK and d8: %s' % (' '.join(args))
     bot.RunProcess(args)
 
 
 if __name__ == '__main__':
   bot.RunBot(GetBuildInfo, RunCompilerTests, build_step=BuildCompiler)