Added tools/bots/editor.py to build the editor (using gyp/build.py) and run editor tests

client/tools/buildbot_annotated_steps.py

+#!/usr/bin/python
 # Copyright (c) 2011, 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.
 
-#!/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 client buildbot steps
 
 Compiles dart client apps with dartc, and run the client tests both in headless
 chromium and headless dartium.
 """
 
@@ skipping 76 matching lines @@
   version - the svn version of the currently checked out code
   '''
   print 'ProcessTools'
 
   toolsBuildScript = os.path.join('.', 'editor', 'build', 'build.py')
 
   # TODO(devoncarew): should we move this into GetBuildInfo()?
   # get the latest changed revision from the current repository sub-tree
   version = GetLatestChangedRevision()
 
-  #TODO: debug statements to be removed in the future.
-  print "mode = " + mode
-  print "name = " + name
-  print "version = " + version
-  print "toolsBuildScript = " + os.path.abspath(toolsBuildScript)
-
   utils = GetUtils()
   outdir = GetOutDir(utils, mode)
   cmds = [sys.executable, toolsBuildScript,
           '--mode=' + mode, '--revision=' + version,
           '--name=' + name, '--out=' + outdir]
   local_env = os.environ
   #if 'linux' in name:
   #  javahome = os.path.join(os.path.expanduser('~'), 'jdk1.6.0_25')
   #  local_env['JAVA_HOME'] = javahome
   #  local_env['PATH'] = (os.path.join(javahome, 'bin') +
@@ skipping 58 matching lines @@
   # 0.1.2.0_r13661
   # 0.1.2.0_r13661_username
   fullVersion = RunDart("tools/version.dart")
 
   m = re.search('._r(\d+)', fullVersion)
   svnRev = m.group(1)
 
   return svnRev
 
 def main():
-  print 'main'
-
   if len(sys.argv) == 0:
     print 'Script pathname not known, giving up.'
     return 1
 
   scriptdir = os.path.dirname(sys.argv[0])
   # Get at the top-level directory. This script is in client/tools
   os.chdir(os.path.abspath(os.path.join(scriptdir, os.pardir, os.pardir)))
 
   if GetShouldClobber():
     print '@@@BUILD_STEP Clobber@@@'
     status = ClobberBuilder()
     if status != 0:
       print '@@@STEP_FAILURE@@@'
       return status
 
 
   #TODO(sigmund): remove this indirection once we update our bots
   (name, version) = GetBuildInfo()
   # The buildbot will set a BUILDBOT_JAVA_HOME relative to the dart
   # root directory, set JAVA_HOME based on that.
   FixJavaHome()
   if name.startswith('dart-editor'):
-    status = ProcessTools('release', name, version)
+    # TODO(kustermann,ricow): This is a temporary hack until we can safely
+    # enable it on main waterfall. We need to remove this eventually
+    is_fyi = False
+    if name.startswith('dart-editor-fyi'):
+      match = re.search('dart-editor-fyi(.*)', name)
+      name = 'dart-editor' + match.group(1)
+      is_fyi = True
+    # Run the old annotated steps script first.
+    status = ProcessTools('release', name, version) or status
+    # In case we're an FYI builder, run 'tools/bots/editor.py' as well
+    if is_fyi:
+      status = ProcessBot(name, 'editor')
   elif name.startswith('pub-'):
     status = ProcessBot(name, 'pub')
   elif name.startswith('vm-android'):
     status = ProcessBot(name, 'android')
   else:
     status = ProcessBot(name, 'compiler')
 
   if status:
     print '@@@STEP_FAILURE@@@'
 
   return status
 
 
 if __name__ == '__main__':
   sys.exit(main())