Merge pull request #13041 from ncteisen/speedup-test-infra

Always Filter Benchmarks

tools/run_tests/run_tests.py

@@ -340,12 +340,12 @@ class CLanguage(object):
             with open(os.devnull, 'w') as fnull:
               tests = subprocess.check_output([binary, '--benchmark_list_tests'],
                                               stderr=fnull)
-            base = None
             for line in tests.split('\n'):
               test = line.strip()
+              if not test: continue
               cmdline = [binary, '--benchmark_filter=%s$' % test] + target['args']
               out.append(self.config.job_spec(cmdline,
-                                              shortname='%s:%s %s' % (binary, test, shortname_ext),
+                                              shortname='%s %s' % (' '.join(cmdline), shortname_ext),
                                               cpu_cost=cpu_cost,
                                               timeout_seconds=_DEFAULT_TIMEOUT_SECONDS * timeout_scaling,
                                               environ=env))