Enable browser controller on ff and chrome on normal waterfall

tools/bots/compiler.py

 #!/usr/bin/python
 
 # Copyright (c) 2012, 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.
 
 """
 Dart2js buildbot steps
 
 Runs tests for the  dart2js compiler.
@@ skipping 90 matching lines @@
 def NeedsXterm(compiler, runtime):
   return runtime in ['ie9', 'ie10', 'chrome', 'safari', 'opera', 'ff', 'drt']
 
 
 def TestStepName(name, flags):
   # Filter out flags with '=' as this breaks the /stats feature of the
   # build bot.
   flags = [x for x in flags if not '=' in x]
   return ('%s tests %s' % (name, ' '.join(flags))).strip()
 
+# TODO(ricow): remove this once we have browser controller drivers for all
+# supported platforms.
+def UseBrowserController(runtime, system):
+  supported_platforms = {
+    'linux': ['ff', 'chromeOnAndroid', 'chrome'],
+    'mac': [],
+    'windows': []
+  }
+  # Platforms that we run on the fyi waterfall only.
+  fyi_supported_platforms = {
+    'linux': [],
+    'mac': ['safari'],
+    'windows': []
+  }
+
+  if (runtime in supported_platforms[system]):
+    return True
+
+  if (os.environ.get('BUILDBOT_SCHEDULER') == "fyi-main" and
+      runtime in fyi_supported_platforms[system]):
+    return True
+
+  return False
+
+
 IsFirstTestStepCall = True
 def TestStep(name, mode, system, compiler, runtime, targets, flags):
   step_name = TestStepName(name, flags)
   with bot.BuildStep(step_name, swallow_error=True):
     sys.stdout.flush()
     if NeedsXterm(compiler, runtime) and system == 'linux':
       cmd = ['xvfb-run', '-a']
     else:
       cmd = []
 
@@ skipping 12 matching lines @@
 
     # TODO(ricow/kustermann): Issue 7339
     if runtime == "safari":
       cmd.append('--nobatch')
 
     if user_test == 'yes':
       cmd.append('--progress=color')
     else:
       cmd.extend(['--progress=buildbot', '-v'])
 
-    # TODO(ricow): temporary hack to run on fyi with --use_browser_controller
-    if (os.environ.get('BUILDBOT_SCHEDULER') == "fyi-main" and
-        runtime in ['chrome', 'ff', 'chromeOnAndroid']):
+    if UseBrowserController(runtime, system):
       cmd.append('--use_browser_controller')
 
     global IsFirstTestStepCall
     if IsFirstTestStepCall:
       IsFirstTestStepCall = False
     else:
       cmd.append('--append_logs')
 
     if flags:
       cmd.extend(flags)
@@ skipping 199 matching lines @@
   """
   with bot.BuildStep('Build SDK and d8'):
     args = [sys.executable, './tools/build.py', '--mode=' + build_info.mode,
             'dart2js_bot']
     print 'Build SDK and d8: %s' % (' '.join(args))
     bot.RunProcess(args)
 
 
 if __name__ == '__main__':
   bot.RunBot(GetBuildInfo, RunCompilerTests, build_step=BuildCompiler)