Run SWTBot tests along with EggPlant.

tools/bots/functional_testing.py

 #!/usr/bin/python
 
 # Copyright (c) 2014, 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.
 
 """
 Buildbot steps for functional testing master and slaves
 """
 
 import os
+import os.path
 import re
 import shutil
+import subprocess
 import sys
 
 import bot
 import bot_utils
 
 utils = bot_utils.GetUtils()
 
 FT_BUILDER = r'ft-slave-(linux|mac)'
 FT_MASTER = r'ft-master'
 
 HOST_OS = utils.GuessOS()
 
+def IsWindows():
+  return HOST_OS == 'win32'
+
 def SrcConfig(name, is_buildbot):
   """Returns info for the current buildbot based on the name of the builder.
 
   - mode: always "release"
   - system: always "linux" or "mac"
   """
   pattern = re.match(FT_BUILDER, name)
   master_pattern = re.match(FT_MASTER, name)
   if not pattern and not master_pattern:
     return None
   if master_pattern:
     tag = 'master'
     system = 'linux'
   else:
     tag = 'slave'
     system = pattern.group(1)
   return bot.BuildInfo('none', 'none', 'release', system,
                        builder_tag=tag)
 
 def Run(args):
   print "Running: %s" % ' '.join(args)
   sys.stdout.flush()
   bot.RunProcess(args)
 
 def FTSlave(config):
+
+  # Run SWTBot tests
+  if len(sys.argv) > 0:
+    scriptdir = os.path.dirname(sys.argv[0])
+    builddir = os.path.join(scriptdir, '..', '..', 'editor', 'build')
+    testScript = os.path.join(builddir, 'testswteditor.py')
+    cmd = [sys.executable, testScript]
+    try:
+      subprocess.call(cmd, shell=IsWindows())
+    except:
+      pass
+
+  # Prepare to run EggPlant tests
   with bot.BuildStep('Fetching editor'):
     revision = int(os.environ['BUILDBOT_GOT_REVISION'])
     bot_name, _ = bot.GetBotName()
     print bot_name
     channel = bot_utils.GetChannelFromName(bot_name)
     namer = bot_utils.GCSNamer(channel=channel)
     system = config.system
     if system == 'mac':
       system = 'macos'
     editor_path = namer.editor_zipfilepath(revision, system, 'x64')
@@ skipping 16 matching lines @@
       print 'Not doing anything on master before the triggers'
       return
     else:
       builddir = os.path.join(bot_utils.DART_DIR,
                               utils.GetBuildDir(HOST_OS),
                               'functional_testing')
       shutil.rmtree(builddir, ignore_errors=True)
       os.makedirs(builddir)
       script_locations = os.path.join(bot_utils.DART_DIR, 'editor', 'ft')
       Run(['/home/chrome-bot/func-test/bot-run', builddir, script_locations])
+      #TODO Copy builddir to shared storage somewhere.
 
 def FTSteps(config):
   if config.builder_tag == 'master':
     FTMaster(config)
   else:
     FTSlave(config)
 
 if __name__ == '__main__':
   bot.RunBot(SrcConfig, FTSteps, build_step=None)