diff options
| author |  Mark D. Roth <roth@google.com> | 2016-09-23 09:47:01 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-09-23 09:47:01 -0700 |
| commit | 1a2e6ac10dbdb3984b4f651ffb042a22269e26c5 (patch) | |
| tree | f86a718f6f48906a601fef3fd04e761bdd1a4771 /tools/run_tests/sources_and_headers.json | |
| parent | 3c09810ac95d7aac9eb13e09ae6c59a68fc1217e (diff) | |
| parent | 942c264861dedd8020fc18d65933e8f4f57e3e46 (diff) | |
Merge remote-tracking branch 'upstream/master' into deadline_filter
Diffstat (limited to 'tools/run_tests/sources_and_headers.json')
| -rw-r--r-- | tools/run_tests/sources_and_headers.json | 47 |
1 files changed, 45 insertions, 2 deletions
diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json index d603813fbc..19879721ac 100644 --- a/tools/run_tests/sources_and_headers.json +++ b/tools/run_tests/sources_and_headers.json @@ -3762,6 +3762,23 @@ ], "headers": [], "language": "c", + "name": "h2_http_proxy_test", + "src": [ + "test/core/end2end/fixtures/h2_http_proxy.c" + ], + "third_party": false, + "type": "target" + }, + { + "deps": [ + "end2end_tests", + "gpr", + "gpr_test_util", + "grpc", + "grpc_test_util" + ], + "headers": [], + "language": "c", "name": "h2_load_reporting_test", "src": [ "test/core/end2end/fixtures/h2_load_reporting.c" @@ -4034,6 +4051,23 @@ ], "headers": [], "language": "c", + "name": "h2_http_proxy_nosec_test", + "src": [ + "test/core/end2end/fixtures/h2_http_proxy.c" + ], + "third_party": false, + "type": "target" + }, + { + "deps": [ + "end2end_nosec_tests", + "gpr", + "gpr_test_util", + "grpc_test_util_unsecure", + "grpc_unsecure" + ], + "headers": [], + "language": "c", "name": "h2_load_reporting_nosec_test", "src": [ "test/core/end2end/fixtures/h2_load_reporting.c" @@ -4668,7 +4702,8 @@ "test/cpp/util/config_grpc_cli.h", "test/cpp/util/grpc_tool.h", "test/cpp/util/proto_file_parser.h", - "test/cpp/util/proto_reflection_descriptor_database.h" + "test/cpp/util/proto_reflection_descriptor_database.h", + "test/cpp/util/service_describer.h" ], "language": "c++", "name": "grpc_cli_libs", @@ -4683,7 +4718,9 @@ "test/cpp/util/proto_file_parser.cc", "test/cpp/util/proto_file_parser.h", "test/cpp/util/proto_reflection_descriptor_database.cc", - "test/cpp/util/proto_reflection_descriptor_database.h" + "test/cpp/util/proto_reflection_descriptor_database.h", + "test/cpp/util/service_describer.cc", + "test/cpp/util/service_describer.h" ], "third_party": false, "type": "lib" @@ -6217,6 +6254,7 @@ "src/core/ext/client_config/client_channel.h", "src/core/ext/client_config/client_channel_factory.h", "src/core/ext/client_config/connector.h", + "src/core/ext/client_config/http_connect_handshaker.h", "src/core/ext/client_config/initial_connect_string.h", "src/core/ext/client_config/lb_policy.h", "src/core/ext/client_config/lb_policy_factory.h", @@ -6242,6 +6280,8 @@ "src/core/ext/client_config/connector.c", "src/core/ext/client_config/connector.h", "src/core/ext/client_config/default_initial_connect_string.c", + "src/core/ext/client_config/http_connect_handshaker.c", + "src/core/ext/client_config/http_connect_handshaker.h", "src/core/ext/client_config/initial_connect_string.c", "src/core/ext/client_config/initial_connect_string.h", "src/core/ext/client_config/lb_policy.c", @@ -6488,6 +6528,7 @@ ], "headers": [ "test/core/end2end/cq_verifier.h", + "test/core/end2end/fixtures/http_proxy.h", "test/core/end2end/fixtures/proxy.h", "test/core/iomgr/endpoint_tests.h", "test/core/util/grpc_profiler.h", @@ -6504,6 +6545,8 @@ "src": [ "test/core/end2end/cq_verifier.c", "test/core/end2end/cq_verifier.h", + "test/core/end2end/fixtures/http_proxy.c", + "test/core/end2end/fixtures/http_proxy.h", "test/core/end2end/fixtures/proxy.c", "test/core/end2end/fixtures/proxy.h", "test/core/iomgr/endpoint_tests.c", |