diff options
author | yang-g <yangg@google.com> | 2018-12-17 11:54:03 -0800 |
---|---|---|
committer | yang-g <yangg@google.com> | 2018-12-17 11:54:10 -0800 |
commit | a303a28895c28a485665fbd617af0025eac7f452 (patch) | |
tree | fd77c6095f6fcf22856a857cf729b04cbd372e1e /tools/run_tests/generated/sources_and_headers.json | |
parent | aa2e731508de93c2756aac782f166598569ddc44 (diff) | |
parent | 3f7e26e08588bcaceab674f1376d39d66cbaf71f (diff) |
Merge with head and resolve conflict.
Diffstat (limited to 'tools/run_tests/generated/sources_and_headers.json')
-rw-r--r-- | tools/run_tests/generated/sources_and_headers.json | 41 |
1 files changed, 39 insertions, 2 deletions
diff --git a/tools/run_tests/generated/sources_and_headers.json b/tools/run_tests/generated/sources_and_headers.json index 75b4fa47ef..290c1d5248 100644 --- a/tools/run_tests/generated/sources_and_headers.json +++ b/tools/run_tests/generated/sources_and_headers.json @@ -6026,9 +6026,43 @@ "headers": [], "is_filegroup": false, "language": "c", - "name": "h2_local_test", + "name": "h2_local_ipv4_test", "src": [ - "test/core/end2end/fixtures/h2_local.cc" + "test/core/end2end/fixtures/h2_local_ipv4.cc" + ], + "third_party": false, + "type": "target" + }, + { + "deps": [ + "end2end_tests", + "gpr", + "grpc", + "grpc_test_util" + ], + "headers": [], + "is_filegroup": false, + "language": "c", + "name": "h2_local_ipv6_test", + "src": [ + "test/core/end2end/fixtures/h2_local_ipv6.cc" + ], + "third_party": false, + "type": "target" + }, + { + "deps": [ + "end2end_tests", + "gpr", + "grpc", + "grpc_test_util" + ], + "headers": [], + "is_filegroup": false, + "language": "c", + "name": "h2_local_uds_test", + "src": [ + "test/core/end2end/fixtures/h2_local_uds.cc" ], "third_party": false, "type": "target" @@ -10397,6 +10431,7 @@ "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h", "test/core/end2end/cq_verifier.h", "test/core/end2end/fixtures/http_proxy_fixture.h", + "test/core/end2end/fixtures/local_util.h", "test/core/end2end/fixtures/proxy.h", "test/core/iomgr/endpoint_tests.h", "test/core/util/debugger_macros.h", @@ -10425,6 +10460,8 @@ "test/core/end2end/cq_verifier.h", "test/core/end2end/fixtures/http_proxy_fixture.cc", "test/core/end2end/fixtures/http_proxy_fixture.h", + "test/core/end2end/fixtures/local_util.cc", + "test/core/end2end/fixtures/local_util.h", "test/core/end2end/fixtures/proxy.cc", "test/core/end2end/fixtures/proxy.h", "test/core/iomgr/endpoint_tests.cc", |