diff options
| author |  ncteisen <ncteisen@gmail.com> | 2018-05-30 16:17:06 -0700 |
|---|---|---|
| committer | ncteisen <ncteisen@gmail.com> | 2018-06-05 16:59:25 -0700 |
| commit | 9a1bb051812a53462b2deb7e472f20e3e1dd785f (patch) | |
| tree | 8a7b99a4aa4d872f998f6cadee4f7387bc6bfc67 /test/core/channel/BUILD | |
| parent | 23c50fda51a38d0484f4b1537492fd93eeae33ac (diff) | |
Build out the channelz unit test
Diffstat (limited to 'test/core/channel/BUILD')
| -rw-r--r-- | test/core/channel/BUILD | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/test/core/channel/BUILD b/test/core/channel/BUILD index c336688209..81c4353129 100644 --- a/test/core/channel/BUILD +++ b/test/core/channel/BUILD @@ -84,13 +84,8 @@ grpc_cc_test( ) grpc_cc_test( -<<<<<<< HEAD - name = "channelz_registry_test", - srcs = ["channelz_registry_test.cc"], -======= name = "channelz_test", srcs = ["channelz_test.cc"], ->>>>>>> Add channelz test language = "C++", deps = [ "//:gpr", @@ -98,10 +93,23 @@ grpc_cc_test( "//:grpc++", "//test/core/util:gpr_test_util", "//test/core/util:grpc_test_util", -<<<<<<< HEAD -======= "//test/cpp/util:channel_trace_proto_helper", ->>>>>>> Add channelz test + ], + external_deps = [ + "gtest", + ], +) + +grpc_cc_test( + name = "channelz_registry_test", + srcs = ["channelz_registry_test.cc"], + language = "C++", + deps = [ + "//:gpr", + "//:grpc", + "//:grpc++", + "//test/core/util:gpr_test_util", + "//test/core/util:grpc_test_util", ], external_deps = [ "gtest", |