Frog changes (in experimental) to get frog integrated into the test infrastructure.

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 21 matching lines @@
     pattern = re.match(BUILDER_PATTERN, builder_name)
     if pattern:
       name = pattern.group(1)
       mode = pattern.group(2)
   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 '''
-  if arch == 'frog':
-    testpy_mode = 'debug'
-  else:
-    testpy_mode = 'release'
+  # TODO(ngeoffray): do something meaningful for debug.
+  testpy_mode = 'release'
   flags = None
   if mode == 'debug':
     flags = '--enable_asserts --enable_type_checks'
   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)
   """
 
-  # first build the vm, so we can build and run frog:
-  PROJECT_PATH = os.path.dirname(FROG_PATH)
-  os.chdir(PROJECT_PATH)
-  print '@@@BUILD_STEP build vm@@@'
-  status = subprocess.call([sys.executable,
-      './tools/build.py', '--mode=release', '--arch=ia32', 'dart_bin'])
-  if status != 0:
-    return status;
-
+  # Make sure we are in the frog directory
   os.chdir(FROG_PATH)
 
   testpy_mode, flags = ConvertConfiguration(arch, mode)
 
-  # create the sym link to the vm, if needed
-  if not os.path.exists('bin/dart_bin'):
-    print '@@@BUILD_STEP link vm@@@'
-    if not os.path.exists('bin'):
-      os.mkdir('bin')
-    status = subprocess.call(
-        ['ln', '-s',
-        os.path.abspath(
-          os.path.join(PROJECT_PATH, 'out', 'Release_ia32', 'dart_bin')),
-        os.path.join(FROG_PATH, 'bin', 'dart_bin')])
-    if status != 0:
-      return status;
-
   print '@@@BUILD_STEP build frog@@@'
-  # delete old copy to ensure that we rebuild it when the vm changes.
-  if testpy_mode == 'release':
-    old_binary = 'out/Release_ia32/dart_bin'
-  else:
-    old_binary = 'out/Debug_ia32/dart_bin'
-  print 'deleting ' + old_binary
-  status = subprocess.call(['rm', old_binary])

[Siggi Cherem (dart-lang), 2011/11/03 15:58:18]

just to make sure I follow - this is not needed because now we made the
dependence explicitly in the .gyp file, correct?

[ngeoffray, 2011/11/03 16:12:55]

Yes, that's correct :)

   status = subprocess.call(
       [sys.executable, '../tools/build.py', '--mode=' + testpy_mode])
   if status != 0:
     return status;
 
   print ('@@@BUILD_STEP frog tests: %s@@@' % arch)
-  cmd  = [sys.executable, '../tools/test.py',
-     '--mode=' + testpy_mode,
-     '--time', '--report', '--progress=buildbot', '-v', 'frog']
+  cmd  = [sys.executable,
+          '../tools/test.py',
+          '--mode=' + testpy_mode,
+          '--component=' + arch,
+          '--time',
+          '--report',
+          '--progress=buildbot',
+          '-v',
+          'language',
+          'corelib']
   if flags:
     cmd.append('--flag=' + flags)
   return subprocess.call(cmd)
 
 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())