diff options
author | yang-g <yangg@google.com> | 2015-12-09 11:26:43 -0800 |
---|---|---|
committer | yang-g <yangg@google.com> | 2015-12-09 11:26:43 -0800 |
commit | 95ee0808835a41091bbb53bc4d891f4d2c3f3ec7 (patch) | |
tree | 92004f506c664757d9672a431c99693b6192bb1a /tools | |
parent | fe9a975655735507b901787232a593122d01bce9 (diff) | |
parent | 5efe9255c0f879f555fc9118e833bee513b14622 (diff) |
merge with head
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 70817eefbb..1382816728 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 fc68803859..e6f4c5de97 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": [], |