Manually add echo.proto to pass Portability build test

sheenaqotj · May 6, 2019 · 2d5a975 · 2d5a975
1 parent 1ba5f5c
commit 2d5a975
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 0 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2917,7 +2917,13 @@ target_link_libraries(test_tcp_server
 endif (gRPC_BUILD_TESTS)
 if (gRPC_BUILD_TESTS)
 
+if (gRPC_BUILD_CODEGEN)
 add_library(callback_test_service
+  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo_mock.grpc.pb.h
   test/cpp/microbenchmarks/callback_test_service.cc
 )
 
@@ -2932,6 +2938,9 @@ if(WIN32 AND MSVC)
   endif()
 endif()
 
+protobuf_generate_grpc_cpp(
+  src/proto/grpc/testing/echo.proto
+)
 
 target_include_directories(callback_test_service
   PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
@@ -2964,6 +2973,7 @@ target_link_libraries(callback_test_service
   ${_gRPC_GFLAGS_LIBRARIES}
 )
 
+endif (gRPC_BUILD_CODEGEN)
 
 endif (gRPC_BUILD_TESTS)
 

diff --git a/Makefile b/Makefile
@@ -5306,6 +5306,7 @@ endif
 
 
 LIBCALLBACK_TEST_SERVICE_SRC = \
+    $(GENDIR)/src/proto/grpc/testing/echo.pb.cc $(GENDIR)/src/proto/grpc/testing/echo.grpc.pb.cc \
     test/cpp/microbenchmarks/callback_test_service.cc \
 
 PUBLIC_HEADERS_CXX += \
@@ -5353,6 +5354,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBCALLBACK_TEST_SERVICE_OBJS:.o=.dep)
 endif
 endif
+$(OBJDIR)/$(CONFIG)/test/cpp/microbenchmarks/callback_test_service.o: $(GENDIR)/src/proto/grpc/testing/echo.pb.cc $(GENDIR)/src/proto/grpc/testing/echo.grpc.pb.cc
 
 
 LIBGRPC++_SRC = \

diff --git a/build.yaml b/build.yaml
@@ -1683,6 +1683,7 @@ libs:
   headers:
   - test/cpp/microbenchmarks/callback_test_service.h
   src:
+  - src/proto/grpc/testing/echo.proto
   - test/cpp/microbenchmarks/callback_test_service.cc
   deps:
   - grpc_benchmark

diff --git a/grpc.gyp b/grpc.gyp
@@ -1419,6 +1419,7 @@
         'grpc++_test_config',
       ],
       'sources': [
+        'src/proto/grpc/testing/echo.proto',
         'test/cpp/microbenchmarks/callback_test_service.cc',
       ],
     },

diff --git a/test/cpp/microbenchmarks/BUILD b/test/cpp/microbenchmarks/BUILD
@@ -233,6 +233,7 @@ grpc_cc_library(
     tags = ["no_windows"],
     deps = [
         ":helpers",
+        "//src/proto/grpc/testing:echo_proto",
         "//test/cpp/util:test_util",
     ],
 )

diff --git a/tools/run_tests/generated/sources_and_headers.json b/tools/run_tests/generated/sources_and_headers.json
@@ -6686,6 +6686,9 @@
       "grpc_unsecure"
     ], 
     "headers": [
+      "src/proto/grpc/testing/echo.grpc.pb.h", 
+      "src/proto/grpc/testing/echo.pb.h", 
+      "src/proto/grpc/testing/echo_mock.grpc.pb.h", 
       "test/cpp/microbenchmarks/callback_test_service.h"
     ], 
     "is_filegroup": false,