aboutsummaryrefslogtreecommitdiffhomepage
path: root/test/core/channel/BUILD
diff options
context:
space:
mode:
authorGravatar ncteisen <ncteisen@gmail.com>2018-05-09 11:10:21 -0700
committerGravatar ncteisen <ncteisen@gmail.com>2018-06-05 16:59:25 -0700
commitc3c6e064b33ab8b7a2d3cf5a56171029d0bb1edc (patch)
tree3dce184ad675ba2ff3adbaf034209a0076c03754 /test/core/channel/BUILD
parentb69f1f6aacad86bdc72e25085d74e64f17f32195 (diff)
Add basic support for GetChannel
Diffstat (limited to 'test/core/channel/BUILD')
-rw-r--r--test/core/channel/BUILD9
1 files changed, 9 insertions, 0 deletions
diff --git a/test/core/channel/BUILD b/test/core/channel/BUILD
index c554b20148..c336688209 100644
--- a/test/core/channel/BUILD
+++ b/test/core/channel/BUILD
@@ -84,8 +84,13 @@ 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",
@@ -93,6 +98,10 @@ 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",