Additional fixes for the bot

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 25 matching lines @@
   return (name, mode)
 
 # TODO(sigmund): delete this convertion when test.py uses the same
 # 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 = '--enable_asserts --enable_type_checks'
+    flags = '--checked'
   return (testpy_mode, flags)
 
 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
@@ skipping 14 matching lines @@
           '--component=' + arch,
           '--time',
           '--report',
           '--progress=buildbot',
           '-v',
           'language',
           'corelib',
           'isolate',
           'frog']
   if flags:
-    cmd.extend(['--flag=' + f for f in flags.split(' ')])
+    cmd.append(flags)
 
   status = subprocess.call(cmd)
   if status != 0:
     return status
 
   print ('@@@BUILD_STEP leg only tests@@@')
   cmd  = [sys.executable,
           '../tools/test.py',
           '--mode=' + testpy_mode,
           '--component=leg',
@@ skipping 36 matching lines @@
     return 1
 
   status = TestFrog(arch, mode)
   if status != 0:
     print '@@@STEP_FAILURE@@@'
   return status
 
 
 if __name__ == '__main__':
   sys.exit(main())