Further refactor interop_client and server to libraries
diff --git a/build.json b/build.json
index 94b66b0..f784388 100644
--- a/build.json
+++ b/build.json
@@ -546,15 +546,11 @@
"secure": "no"
},
{
- "name": "interop_client_lib",
+ "name": "interop_client_helper",
"build": "private",
"language": "c++",
"src": [
- "test/cpp/interop/empty.proto",
- "test/cpp/interop/messages.proto",
- "test/cpp/interop/test.proto",
- "test/cpp/interop/client_helper.cc",
- "test/cpp/interop/interop_client.cc"
+ "test/cpp/interop/client_helper.cc"
],
"deps": [
"grpc++_test_util",
@@ -565,7 +561,27 @@
]
},
{
- "name": "interop_server_lib",
+ "name": "interop_client_main",
+ "build": "private",
+ "language": "c++",
+ "src": [
+ "test/cpp/interop/empty.proto",
+ "test/cpp/interop/messages.proto",
+ "test/cpp/interop/test.proto",
+ "test/cpp/interop/client.cc",
+ "test/cpp/interop/interop_client.cc"
+ ],
+ "deps": [
+ "grpc++_test_util",
+ "grpc_test_util",
+ "grpc++",
+ "grpc",
+ "gpr_test_util",
+ "gpr"
+ ]
+ },
+ {
+ "name": "interop_server_helper",
"build": "private",
"language": "c++",
"src": [
@@ -579,6 +595,25 @@
]
},
{
+ "name": "interop_server_main",
+ "build": "private",
+ "language": "c++",
+ "src": [
+ "test/cpp/interop/empty.proto",
+ "test/cpp/interop/messages.proto",
+ "test/cpp/interop/test.proto",
+ "test/cpp/interop/server.cc"
+ ],
+ "deps": [
+ "grpc++_test_util",
+ "grpc_test_util",
+ "grpc++",
+ "grpc",
+ "gpr_test_util",
+ "gpr"
+ ]
+ },
+ {
"name": "pubsub_client_lib",
"build": "private",
"language": "c++",
@@ -1922,11 +1957,10 @@
"build": "test",
"run": false,
"language": "c++",
- "src": [
- "test/cpp/interop/client.cc"
- ],
+ "src": [],
"deps": [
- "interop_client_lib",
+ "interop_client_main",
+ "interop_client_helper",
"grpc++_test_util",
"grpc_test_util",
"grpc++",
@@ -1940,14 +1974,10 @@
"build": "test",
"run": false,
"language": "c++",
- "src": [
- "test/cpp/interop/empty.proto",
- "test/cpp/interop/messages.proto",
- "test/cpp/interop/test.proto",
- "test/cpp/interop/server.cc"
- ],
+ "src": [],
"deps": [
- "interop_server_lib",
+ "interop_server_main",
+ "interop_server_helper",
"grpc++_test_util",
"grpc_test_util",
"grpc++",