Always print the runtime as part of the stepname

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 122 matching lines @@
   return bot.BuildInfo(compiler, runtime, mode, system, checked, host_checked,
                        minified, shard_index, total_shards, is_buildbot,
                        test_set, csp, arch, dart2js_full)
 
 
 def NeedsXterm(compiler, runtime):
   return runtime in ['ie9', 'ie10', 'ie11', 'chrome', 'safari', 'opera', 
                      'ff', 'drt', 'dartium']
 
 
-def TestStepName(name, flags):
+def TestStepName(name, runtime, 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()
+  step_name = '%s-%s tests %s' % (name, runtime, ' '.join(flags))
+  return step_name.strip()
 
 
 IsFirstTestStepCall = True
 def TestStep(name, mode, system, compiler, runtime, targets, flags, arch):
-  step_name = TestStepName(name, flags)
+  step_name = TestStepName(name, runtime, 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 = []
 
     user_test = os.environ.get('USER_TEST', 'no')
 
     cmd.extend([sys.executable,
@@ skipping 96 matching lines @@
     # Run the unit tests in checked mode (the VM's checked mode).
     unit_test_flags.append('--checked')
     TestStep("dart2js_unit", mode, system, 'none', 'vm', ['dart2js'],
              unit_test_flags, arch)
 
   if compiler == 'dart2js' and runtime in ['ie10', 'ie11']:
     TestStep("%s-%s" % (compiler, runtime), mode, system, compiler, runtime,
              ['html', 'pkg', 'samples'], flags, arch)
   else:
     # Run the default set of test suites.
-    TestStep("%s-%s" % (compiler, runtime), mode, system, compiler,
+    TestStep(compiler, mode, system, compiler,
              runtime, [], flags, arch)
 
     if compiler == 'dart2js':
       # TODO(kasperl): Consider running peg and css tests too.
       extras = ['dart2js_extra', 'dart2js_native']
       extras_flags = flags
       if (system == 'linux'
           and runtime == 'd8'
           and not '--host-checked' in extras_flags):
         # Run the extra tests in checked mode, but only on linux/d8.
         # Other systems have less resources and tend to time out.
         extras_flags = extras_flags + ['--host-checked']
-      TestStep("dart2js_extra", mode, system, 'dart2js', runtime, extras,
+      TestStep('dart2js_extra', mode, system, 'dart2js', runtime, extras,
                extras_flags, arch)
 
-      TestStep("try_dart", mode, system, 'dart2js', runtime, ['try'],
+      TestStep('try_dart', mode, system, 'dart2js', runtime, ['try'],
                extras_flags, arch)
 
 
 def GetHasHardCodedCheckedMode(build_info):
   # TODO(ricow): We currently run checked mode tests on chrome on linux and
   # on the slow (all) IE windows bots. This is a hack and we should use the
   # normal sharding and checked splitting functionality when we get more
   # vms for testing this.
   if (build_info.system == 'linux' and build_info.runtime == 'drt'):
     return True
@@ skipping 75 matching lines @@
   """
   with bot.BuildStep('Build SDK'):
     args = [sys.executable, './tools/build.py', '--mode=' + build_info.mode,
             '--arch=' + build_info.arch, 'dart2js_bot']
     print 'Build SDK and d8: %s' % (' '.join(args))
     bot.RunProcess(args)
 
 
 if __name__ == '__main__':
   bot.RunBot(GetBuildInfo, RunCompilerTests, build_step=BuildCompiler)