diff options
| author |  Jorge Canizales <jcanizales@google.com> | 2016-07-01 16:52:08 -0700 |
|---|---|---|
| committer | Jorge Canizales <jcanizales@google.com> | 2016-07-01 16:52:08 -0700 |
| commit | 60fec9e547bc6fac2a2ba1e6dad47950d7d5042e (patch) | |
| tree | dacaf917eb051120c5c1dbaa7a03fdd15aa84eec /tools/run_tests | |
| parent | f29e364168240bc472e22a6b55d2f27d501fceea (diff) | |
| parent | 123a1b76d30f47527774d878f9e0e6cb30f4fb83 (diff) | |
Merge master into merge-0.14-into-master
The protobuf commit conflicted. Resolved to the latest one.
Diffstat (limited to 'tools/run_tests')
| -rw-r--r-- | tools/run_tests/sources_and_headers.json | 31 | ||||
| -rw-r--r-- | tools/run_tests/tests.json | 21 |
2 files changed, 41 insertions, 11 deletions
diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json index 65de89c0ab..6d7cfdaf23 100644 --- a/tools/run_tests/sources_and_headers.json +++ b/tools/run_tests/sources_and_headers.json @@ -81,6 +81,23 @@ }, { "deps": [ + "gpr", + "gpr_test_util", + "grpc", + "grpc_test_util", + "test_tcp_server" + ], + "headers": [], + "language": "c", + "name": "bad_server_response_test", + "src": [ + "test/core/end2end/bad_server_response_test.c" + ], + "third_party": false, + "type": "target" + }, + { + "deps": [ "grpc", "grpc_test_util" ], @@ -805,9 +822,7 @@ { "deps": [ "gpr", - "gpr_test_util", - "grpc", - "grpc_test_util" + "grpc" ], "headers": [], "language": "c", @@ -901,9 +916,7 @@ { "deps": [ "gpr", - "gpr_test_util", - "grpc", - "grpc_test_util" + "grpc" ], "headers": [], "language": "c", @@ -933,9 +946,7 @@ { "deps": [ "gpr", - "gpr_test_util", - "grpc", - "grpc_test_util" + "grpc" ], "headers": [], "language": "c", @@ -4447,7 +4458,6 @@ { "deps": [ "gpr", - "grpc", "grpc++_base", "grpc++_codegen_base", "grpc++_codegen_base_src", @@ -6504,7 +6514,6 @@ }, { "deps": [ - "grpc", "grpc++_codegen_base" ], "headers": [ diff --git a/tools/run_tests/tests.json b/tools/run_tests/tests.json index dedd55774b..93d42e3454 100644 --- a/tools/run_tests/tests.json +++ b/tools/run_tests/tests.json @@ -98,6 +98,27 @@ "flaky": false, "gtest": false, "language": "c", + "name": "bad_server_response_test", + "platforms": [ + "linux", + "mac", + "posix", + "windows" + ] + }, + { + "args": [], + "ci_platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "cpu_cost": 1.0, + "exclude_configs": [], + "flaky": false, + "gtest": false, + "language": "c", "name": "bin_decoder_test", "platforms": [ "linux", |