aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt1
-rw-r--r--bazel/generate_cc.bzl6
-rw-r--r--build.yaml6
-rw-r--r--test/cpp/codegen/golden_file_test.cc4
-rw-r--r--tools/run_tests/generated/sources_and_headers.json3
-rw-r--r--tools/run_tests/generated/tests.json2
-rw-r--r--vsprojects/vcxproj/test/golden_file_test/golden_file_test.vcxproj2
7 files changed, 17 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d3db20d420..4c23d28b90 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10082,6 +10082,7 @@ add_executable(golden_file_test
${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/compiler_test.grpc.pb.cc
${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/compiler_test.pb.h
${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/compiler_test.grpc.pb.h
+ ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/compiler_test_mock.grpc.pb.h
test/cpp/codegen/golden_file_test.cc
third_party/googletest/googletest/src/gtest-all.cc
)
diff --git a/bazel/generate_cc.bzl b/bazel/generate_cc.bzl
index 7dd2c0486b..dac76f67f1 100644
--- a/bazel/generate_cc.bzl
+++ b/bazel/generate_cc.bzl
@@ -23,10 +23,10 @@ def generate_cc_impl(ctx):
arguments = []
if ctx.executable.plugin:
arguments += ["--plugin=protoc-gen-PLUGIN=" + ctx.executable.plugin.path]
- arguments += ["--PLUGIN_out=" + ",".join(ctx.attr.flags)]
+ gen_mock = ""
if ctx.attr.generate_mock:
- arguments += [",generate_mock_code=true"]
- arguments += [":" + dir_out]
+ gen_mock = ",generate_mock_code=true"
+ arguments += ["--PLUGIN_out=" + gen_mock + ",".join(ctx.attr.flags) + ":" + dir_out]
additional_input = [ctx.executable.plugin]
else:
arguments += ["--cpp_out=" + ",".join(ctx.attr.flags) + ":" + dir_out]
diff --git a/build.yaml b/build.yaml
index 8fd1b7bad4..52ff98c64b 100644
--- a/build.yaml
+++ b/build.yaml
@@ -948,8 +948,8 @@ filegroups:
- name: grpc++_test
language: c++
public_headers:
- - include/grpc++/test/server_context_test_spouse.h
- include/grpc++/test/mock_stream.h
+ - include/grpc++/test/server_context_test_spouse.h
deps:
- grpc++
- name: thrift_util
@@ -3630,7 +3630,7 @@ targets:
- grpc
- gpr
args:
- - --generated_file_path=gens/src/proto/grpc/testing
+ - --generated_file_path=gens/src/proto/grpc/testing/
- name: grpc_cli
build: test
run: false
@@ -3891,6 +3891,8 @@ targets:
gtest: true
build: test
language: c++
+ headers:
+ - include/grpc++/test/mock_stream.h
src:
- test/cpp/end2end/mock_test.cc
deps:
diff --git a/test/cpp/codegen/golden_file_test.cc b/test/cpp/codegen/golden_file_test.cc
index dd09471fdb..7789ac738b 100644
--- a/test/cpp/codegen/golden_file_test.cc
+++ b/test/cpp/codegen/golden_file_test.cc
@@ -76,7 +76,9 @@ TEST(GoldenMockFileTest, TestGeneratedMockFile) {
int main(int argc, char **argv) {
::testing::InitGoogleTest(&argc, argv);
::google::ParseCommandLineFlags(&argc, &argv, true);
- if (FLAGS_generated_file_path.empty()) return 1;
+ if (FLAGS_generated_file_path.empty()) {
+ FLAGS_generated_file_path = "gens/src/proto/grpc/testing/";
+ }
if (FLAGS_generated_file_path.back() != '/')
FLAGS_generated_file_path.append("/");
return RUN_ALL_TESTS();
diff --git a/tools/run_tests/generated/sources_and_headers.json b/tools/run_tests/generated/sources_and_headers.json
index c019996174..fa28af7f7b 100644
--- a/tools/run_tests/generated/sources_and_headers.json
+++ b/tools/run_tests/generated/sources_and_headers.json
@@ -3031,6 +3031,7 @@
],
"headers": [
"src/proto/grpc/testing/compiler_test.grpc.pb.h",
+ "src/proto/grpc/testing/compiler_test_mock.grpc.pb.h",
"src/proto/grpc/testing/compiler_test.pb.h"
],
"is_filegroup": false,
@@ -8933,12 +8934,14 @@
"grpc++"
],
"headers": [
+ "include/grpc++/test/mock_stream.h",
"include/grpc++/test/server_context_test_spouse.h"
],
"is_filegroup": true,
"language": "c++",
"name": "grpc++_test",
"src": [
+ "include/grpc++/test/mock_stream.h",
"include/grpc++/test/server_context_test_spouse.h"
],
"third_party": false,
diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json
index a08caf30d3..408b38f844 100644
--- a/tools/run_tests/generated/tests.json
+++ b/tools/run_tests/generated/tests.json
@@ -3263,7 +3263,7 @@
},
{
"args": [
- "--generated_file_path=gens/src/proto/grpc/testing/compiler_test.grpc.pb.h"
+ "--generated_file_path=gens/src/proto/grpc/testing/"
],
"ci_platforms": [
"linux",
diff --git a/vsprojects/vcxproj/test/golden_file_test/golden_file_test.vcxproj b/vsprojects/vcxproj/test/golden_file_test/golden_file_test.vcxproj
index e9802773d8..7deebd1728 100644
--- a/vsprojects/vcxproj/test/golden_file_test/golden_file_test.vcxproj
+++ b/vsprojects/vcxproj/test/golden_file_test/golden_file_test.vcxproj
@@ -168,6 +168,8 @@
</ClCompile>
<ClInclude Include="$(SolutionDir)\..\src\proto\grpc\testing\compiler_test.grpc.pb.h">
</ClInclude>
+ <ClInclude Include="$(SolutionDir)\..\src\proto\grpc\testing\compiler_test_mock.grpc.pb.h">
+ </ClInclude>
<ClCompile Include="$(SolutionDir)\..\test\cpp\codegen\golden_file_test.cc">
</ClCompile>
</ItemGroup>