diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-08-12 12:00:36 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-08-12 12:00:36 -0700 |
| commit | d067c263b250657891de4ad96ae51249435c6066 (patch) | |
| tree | 03611c21ff494f0652e70d424af1dddae4c1da28 /templates/tools/run_tests/tests.json.template | |
| parent | d5689305612f5597716a4337ce934883a472a266 (diff) | |
| parent | 826f07eb6f8dc2366375b7c96cc12bca1302518c (diff) | |
Merge github.com:grpc/grpc into y12kdm3
Conflicts:
src/core/security/google_default_credentials.c
test/core/security/verify_jwt.c
Diffstat (limited to 'templates/tools/run_tests/tests.json.template')
| -rw-r--r-- | templates/tools/run_tests/tests.json.template | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/tools/run_tests/tests.json.template b/templates/tools/run_tests/tests.json.template index d1ba5ed43c..ffbf843235 100644 --- a/templates/tools/run_tests/tests.json.template +++ b/templates/tools/run_tests/tests.json.template @@ -5,8 +5,8 @@ import json ${json.dumps([{"name": tgt.name, "language": tgt.language, "platforms": tgt.platforms, + "ci_platforms": tgt.ci_platforms, "flaky": tgt.flaky} for tgt in targets if tgt.get('run', True) and tgt.build == 'test'], sort_keys=True, indent=2)} - |