diff options
| author |  David G. Quintas <dgq@google.com> | 2017-02-28 14:41:36 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-02-28 14:41:36 -0800 |
| commit | 9ccebc3a459cd6783a6d219c1f734308eb6e822a (patch) | |
| tree | 1e946d37c6b798db7a3d810e9089cea436d8abef /tools | |
| parent | c1d9d51e5414a68252fe1ee065549aacf9f3f7ed (diff) | |
| parent | e8543571170a66064072cbb25fc09aec3bfc285d (diff) | |
Merge pull request #9773 from dgquintas/build_files
Test BUILD file assortment
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/run_tests/generated/tests.json | 4 | ||||
| -rwxr-xr-x | tools/run_tests/run_tests.py | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json index eca65ac533..13b06efa38 100644 --- a/tools/run_tests/generated/tests.json +++ b/tools/run_tests/generated/tests.json @@ -3005,7 +3005,9 @@ ] }, { - "args": [], + "args": [ + "--generated_file_path=gens/src/proto/grpc/testing/compiler_test.grpc.pb.h" + ], "ci_platforms": [ "linux", "mac", diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 9e9af59c25..9741624c4f 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -307,9 +307,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)) |