diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-12-22 12:50:36 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-12-22 12:50:36 -0800 |
| commit | 0fe5ee7be3ffc6386a6e0aefc40342cf64f44062 (patch) | |
| tree | a39e47b88554fecb5a71a49d9e157b8dce6e9b58 /templates/tools/run_tests | |
| parent | d491897c4050bce09025d8ad0011d38c14ab0dad (diff) | |
BoringSSL integration: non-vsprojects changes
Diffstat (limited to 'templates/tools/run_tests')
| -rw-r--r-- | templates/tools/run_tests/sources_and_headers.json.template | 3 | ||||
| -rw-r--r-- | templates/tools/run_tests/tests.json.template | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/templates/tools/run_tests/sources_and_headers.json.template b/templates/tools/run_tests/sources_and_headers.json.template index 6f51ed7323..ba1c5a5ef8 100644 --- a/templates/tools/run_tests/sources_and_headers.json.template +++ b/templates/tools/run_tests/sources_and_headers.json.template @@ -31,5 +31,6 @@ tgt.get('headers', []) + proto_headers(tgt.src)), "deps": sorted(tgt.get('deps', []))} - for tgt in (targets + libs)], + for tgt in (targets + libs) + if not tgt.boringssl], sort_keys=True, indent=2)} diff --git a/templates/tools/run_tests/tests.json.template b/templates/tools/run_tests/tests.json.template index 655976ac86..3a3ac1e0f3 100644 --- a/templates/tools/run_tests/tests.json.template +++ b/templates/tools/run_tests/tests.json.template @@ -8,8 +8,10 @@ "language": tgt.language, "platforms": tgt.platforms, "ci_platforms": tgt.ci_platforms, - "exclude_configs": tgt.get("exclude_configs", []), + "exclude_configs": tgt.get("exclude_configs", []), + "args": [], "flaky": tgt.flaky} for tgt in targets - if tgt.get('run', True) and tgt.build == 'test'], + if tgt.get('run', True) and tgt.build == 'test'] + + tests, sort_keys=True, indent=2)} |