Merge pull request #12641 from ctiller/simple_names

Use shortname for shortname for json_run_localhost tests
7 years ago · 1e9650ca36
parent a262f8fa79 0f7dc4f71d
commit 1e9650ca36
1 changed files with 5 additions and 4 deletions
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@ -350,11 +350,12 @@ class CLanguage(object):
                                                environ=env))
          else:
            cmdline = [binary] + target['args']
+            shortname = target.get('shortname', ' '.join(
+                          pipes.quote(arg)
+                          for arg in cmdline))
+            shortname += shortname_ext
            out.append(self.config.job_spec(cmdline,
-                                            shortname=' '.join(
-                                                          pipes.quote(arg)
-                                                          for arg in cmdline) +
-                                                      shortname_ext,
+                                            shortname=shortname,
                                            cpu_cost=cpu_cost,
                                            flaky=target.get('flaky', False),
                                            timeout_seconds=target.get('timeout_seconds', _DEFAULT_TIMEOUT_SECONDS) * timeout_scaling,