Minor code clean-ups addressing Nicolas suggestions

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 28 matching lines @@
 # configuration we do here.
 def ConvertConfiguration(arch, mode):
   ''' Convert arch/mode into modes/flags for test.py '''
   # TODO(ngeoffray): do something meaningful for debug.
   testpy_mode = 'release'
   flags = None
   if mode == 'debug':
     flags = '--checked'
   return (testpy_mode, flags)
 
+def TestStep(message, mode, component, targets, flags):
+  print '@@@BUILD_STEP %s: %s@@@' % (message, component)
+  if component == 'frogium':
+    cmd = ['xvfb-run']
+  else:
+    cmd = []
+
+  cmd = (cmd
+      + [sys.executable,
+          '../tools/test.py',
+          '--mode=' + mode,
+          '--component=' + component,
+          '--time',
+          '--report',
+          '--progress=buildbot',
+          '-v']
+      + targets)
+  if flags:
+    cmd.append(flags)
+  return subprocess.call(cmd)
+
 def TestFrog(arch, mode):
   """ build and test frog.
    Args:
      - arch: either 'frog' or 'frogsh' (frog self-hosted)
      - mode: either 'debug' (with type checks) or 'release' (without)
   """
 
   # Make sure we are in the frog directory
   os.chdir(FROG_PATH)
-
   testpy_mode, flags = ConvertConfiguration(arch, mode)
 
   print '@@@BUILD_STEP build frog@@@'
-  status = subprocess.call(
-      [sys.executable, '../tools/build.py', '--mode=' + testpy_mode])
-  if status != 0:
-    return status;
+  if subprocess.call(
+      [sys.executable, '../tools/build.py', '--mode=' + testpy_mode]) != 0:
+    return 1
 
-  print ('@@@BUILD_STEP frog tests: %s@@@' % arch)
-  cmd  = [sys.executable,
-          '../tools/test.py',
-          '--mode=' + testpy_mode,
-          '--component=' + arch,
-          '--time',
-          '--report',
-          '--progress=buildbot',
-          '-v',
-          'language',
-          'corelib',
-          'isolate',
-          'frog']
-  if flags:
-    cmd.append(flags)
+  if TestStep("frog tests", testpy_mode, arch,

[Emily Fortuna, 2011/11/11 21:49:57]

nit: move the word "tests" up into TestStep?

[Siggi Cherem (dart-lang), 2011/11/11 22:20:19]

:) Done

+      ['language', 'corelib', 'isolate', 'frog'], flags) != 0:
+    return 1
 
-  status = subprocess.call(cmd)
-  if status != 0:
-    return status
+  if TestStep("leg only tests", testpy_mode, 'leg', ['leg_only'], flags) != 0:
+    return 1
 
-  print ('@@@BUILD_STEP leg only tests@@@')
-  cmd  = [sys.executable,
-          '../tools/test.py',
-          '--mode=' + testpy_mode,
-          '--component=leg',
-          '--time',
-          '--report',
-          '--progress=buildbot',
-          '-v',
-          'leg_only']
-  if flags:
-    cmd.append(flags)
+  if (arch == 'frogsh' and
+      TestStep("client tests", testpy_mode, 'frogium', ['client'], flags) != 0):
+    return 1
 
-  status = subprocess.call(cmd)
-  if status != 0:
-    return status
+  if TestStep("frog co19 tests", testpy_mode, arch, ['co19'], flags) != 0:
+    return 1
 
-  if arch == 'frogsh':
-    print ('@@@BUILD_STEP client browser tests@@@')
-    cmd  = ['xvfb-run', sys.executable,
-            '../tools/test.py',
-            '--mode=' + testpy_mode,
-            '--component=frogium',
-            '--time',
-            '--report',
-            '--progress=buildbot',
-            '-v',
-            'client']
-    if flags:
-      cmd.append(flags)
-
-    status = subprocess.call(cmd)
-    if status != 0:
-      return status
-
-  print ('@@@BUILD_STEP frog co19 tests: %s@@@' %arch)
-  cmd  = [sys.executable,
-          '../tools/test.py',
-          '--mode=' + testpy_mode,
-          '--component=' + arch,
-          '--time',
-          '--report',
-          '--progress=buildbot',
-          '-v',
-          'co19']
-  if flags:
-    cmd.append(flags)
-
-  return subprocess.call(cmd)
+  return 0
 
 def main():
   print 'main'
   if len(sys.argv) == 0:
     print 'Script pathname not known, giving up.'
     return 1
 
   arch, mode = GetBuildInfo()
   print "arch: %s, mode: %s" % (arch, mode)
   if arch is None:
     return 1
 
   status = TestFrog(arch, mode)
   if status != 0:
     print '@@@STEP_FAILURE@@@'
   return status
 
 
 if __name__ == '__main__':
   sys.exit(main())