diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-09-19 13:10:09 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-09-19 13:10:09 -0700 |
| commit | 1e9650ca36a3a68861cb944af18db1576843da83 (patch) | |
| tree | f7a15d370b244d5e6e557e972017c2504bd21796 /tools | |
| parent | a262f8fa79fd86238343c18911bbe3c5e1f767cd (diff) | |
| parent | 0f7dc4f71d074157263462e49079d95277e83dfe (diff) | |
Merge pull request #12641 from ctiller/simple_names
Use shortname for shortname for json_run_localhost tests
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/run_tests/run_tests.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 176c1097ee..b38108d456 100755 --- 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, |