Merge branch 'runtests_args' into build_files

8 years ago · 29793b0afd
parent bfd2c647b4 947e530e7f
commit 29793b0afd
1 changed files with 2 additions and 2 deletions
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@ -306,9 +306,9 @@ class CLanguage(object):
                assert base is not None
                assert line[1] == ' '
                test = base + line.strip()
-                cmdline = [binary] + ['--gtest_filter=%s' % test]
+                cmdline = [binary, '--gtest_filter=%s' % test] + target['args']
                out.append(self.config.job_spec(cmdline,
-                                                shortname='%s --gtest_filter=%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))