diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-12-09 11:19:59 -0800 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-12-09 11:19:59 -0800 |
| commit | 3824b6e976317a4426daca2ce2de77e89550a78c (patch) | |
| tree | 24f0871fec9cba9dc66329012054832b49ff9419 /tools | |
| parent | 179e6febd237ea387a0075f405a503e841d1a721 (diff) | |
| parent | 5efe9255c0f879f555fc9118e833bee513b14622 (diff) | |
Merge github.com:grpc/grpc into connectivity-state
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/run_tests/sources_and_headers.json | 14 | ||||
| -rw-r--r-- | tools/run_tests/tests.json | 18 |
2 files changed, 32 insertions, 0 deletions
diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json index 7db41017fb..5be63bbe2b 100644 --- a/tools/run_tests/sources_and_headers.json +++ b/tools/run_tests/sources_and_headers.json @@ -585,6 +585,20 @@ ], "headers": [], "language": "c", + "name": "grpc_invalid_channel_args_test", + "src": [ + "test/core/surface/invalid_channel_args_test.c" + ] + }, + { + "deps": [ + "gpr", + "gpr_test_util", + "grpc", + "grpc_test_util" + ], + "headers": [], + "language": "c", "name": "grpc_json_token_test", "src": [ "test/core/security/json_token_test.c" diff --git a/tools/run_tests/tests.json b/tools/run_tests/tests.json index 2a9e850bfb..841dc9ca38 100644 --- a/tools/run_tests/tests.json +++ b/tools/run_tests/tests.json @@ -679,6 +679,24 @@ "ci_platforms": [ "linux", "mac", + "posix", + "windows" + ], + "exclude_configs": [], + "flaky": false, + "language": "c", + "name": "grpc_invalid_channel_args_test", + "platforms": [ + "linux", + "mac", + "posix", + "windows" + ] + }, + { + "ci_platforms": [ + "linux", + "mac", "posix" ], "exclude_configs": [], |