Rename leg -> dart2js.

dart/frog/scripts/buildbot_annotated_steps.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.
 
 """Dart frog buildbot steps
 
 Runs tests for the frog compiler (running on the vm or the self-hosting version)
 """
@@ skipping 68 matching lines @@
   return component in ['frogsh', 'frogium', 'legium', 'webdriver']
 
 def TestStep(name, mode, system, component, targets, flags):
   print '@@@BUILD_STEP %s tests: %s %s@@@' % (name, component, ' '.join(flags))
   sys.stdout.flush()
   if ComponentsNeedsXterm(component) and system == 'linux':
     cmd = ['xvfb-run', '-a']
   else:
     cmd = []
 
+  user_test = os.environ.get('USER_TEST', 'no')
+
   cmd.extend([sys.executable,
               os.path.join(os.curdir, 'tools', 'test.py'),
               '--mode=' + mode,
               '--component=' + component,
               '--time',
-              '--report',
-              '--progress=buildbot',
-              '-v'])
+              '--report'])
+
+  if user_test == 'yes':
+    cmd.append('--progress=color')
+  else:
+    cmd.extend(['--progress=buildbot', '-v'])
+
   if flags:
     cmd.extend(flags)
   cmd.extend(targets)
 
   print 'running %s' % (' '.join(cmd))
   exit_code = subprocess.call(cmd, env=NO_COLOR_ENV)
   if exit_code != 0:
     print '@@@STEP_FAILURE@@@'
   return exit_code
 
 
 def BuildFrog(component, mode, system):
   """ build frog.
    Args:
-     - component: either 'leg', 'frog', 'frogsh' (frog self-hosted), 'frogium'
-       or 'legium'
+     - component: either 'dart2js', 'frog', 'frogsh' (frog
+       self-hosted), 'frogium' or 'legium'
      - mode: either 'debug' or 'release'
      - system: either 'linux', 'mac', or 'win7'
   """
 
   os.chdir(DART_PATH)
 
   print '@@@BUILD_STEP build frog@@@'
 
   args = [sys.executable, './tools/build.py', '--mode=' + mode, 'frog']
   print 'running %s' % (' '.join(args))
   exit_code = subprocess.call(args, env=NO_COLOR_ENV)
 
   if component == 'dart2js':
     return exit_code
 
   args = [sys.executable, './tools/build.py', '--mode=' + mode, 'frogsh']
   print 'running %s' % (' '.join(args))
   return subprocess.call(args, env=NO_COLOR_ENV) | exit_code
 
 
 def TestFrog(component, mode, system, browser, option, flags):
   """ test frog.
    Args:
-     - component: either 'leg', 'frog', 'frogsh' (frog self-hosted), 'frogium',
-       or 'legium'
+     - component: either 'dart2js', 'frog', 'frogsh' (frog
+       self-hosted), 'frogium', or 'legium'
      - mode: either 'debug' or 'release'
      - system: either 'linux', 'mac', or 'win7'
      - browser: one of the browsers, see GetBuildInfo
      - option: 'checked'
      - flags: extra flags to pass to test.dart
   """
 
   # Make sure we are in the frog directory
   os.chdir(DART_PATH)
 
   if component == 'dart2js':
     if (option == 'checked'):
       flags.append('--host-checked')
     # Leg isn't self-hosted (yet) so we run the leg unit tests on the VM.
-    TestStep("leg_extra", mode, system, 'vm', ['leg'], ['--checked'])
+    TestStep("dart2js_unit", mode, system, 'vm', ['leg'], ['--checked'])
 
     extra_suites = ['leg_only', 'frog_native']
-    TestStep("leg_extra", mode, system, 'leg', extra_suites, flags)
+    TestStep("dart2js_extra", mode, system, 'dart2js', extra_suites, flags)
 
-    TestStep("leg", mode, system, 'leg', [], flags)
+    TestStep("dart2js", mode, system, 'dart2js', [], flags)
 
   elif component != 'frogium': # frog and frogsh
     TestStep("frog", mode, system, component, [], flags)
     TestStep("frog_extra", mode, system,
         component, ['frog', 'frog_native', 'peg', 'css'], flags)
     TestStep("sdk", mode, system,
         'vm', ['dartdoc'], flags)
 
   else:
     tests = ['client', 'language', 'corelib', 'isolate', 'frog',
@@ skipping 89 matching lines @@
   if status != 0:
     print '@@@STEP_FAILURE@@@'
 
   if component == 'frogium':
     CleanUpTemporaryFiles(system, browser)
   return status
 
 
 if __name__ == '__main__':
   sys.exit(main())