From e5389b6335156800f8693b30af13eff3224d72ab Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Thu, 7 Jun 2018 09:37:25 +0200 Subject: use testcodegen.proto for distribtest --- test/distrib/csharp/test_codegen/helloworld.proto | 38 ---------------------- test/distrib/csharp/test_codegen/test_codegen.sh | 2 +- test/distrib/csharp/test_codegen/testcodegen.proto | 29 +++++++++++++++++ 3 files changed, 30 insertions(+), 39 deletions(-) delete mode 100644 test/distrib/csharp/test_codegen/helloworld.proto create mode 100644 test/distrib/csharp/test_codegen/testcodegen.proto (limited to 'test/distrib') diff --git a/test/distrib/csharp/test_codegen/helloworld.proto b/test/distrib/csharp/test_codegen/helloworld.proto deleted file mode 100644 index be878ce25f..0000000000 --- a/test/distrib/csharp/test_codegen/helloworld.proto +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright 2015 gRPC authors. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -syntax = "proto3"; - -option java_multiple_files = true; -option java_package = "io.grpc.examples.helloworld"; -option java_outer_classname = "HelloWorldProto"; -option objc_class_prefix = "HLW"; - -package helloworld; - -// The greeting service definition. -service Greeter { - // Sends a greeting - rpc SayHello (HelloRequest) returns (HelloReply) {} -} - -// The request message containing the user's name. -message HelloRequest { - string name = 1; -} - -// The response message containing the greetings -message HelloReply { - string message = 1; -} diff --git a/test/distrib/csharp/test_codegen/test_codegen.sh b/test/distrib/csharp/test_codegen/test_codegen.sh index f91959ea07..0f4d260326 100755 --- a/test/distrib/csharp/test_codegen/test_codegen.sh +++ b/test/distrib/csharp/test_codegen/test_codegen.sh @@ -31,7 +31,7 @@ fi PROTOC="../packages/Grpc.Tools.__GRPC_NUGET_VERSION__/tools/${PLATFORM_ARCH}/protoc" PLUGIN="../packages/Grpc.Tools.__GRPC_NUGET_VERSION__/tools/${PLATFORM_ARCH}/grpc_csharp_plugin" -$PROTOC --plugin="protoc-gen-grpc=${PLUGIN}" --csharp_out=. --grpc_out=. -I . helloworld.proto +$PROTOC --plugin="protoc-gen-grpc=${PLUGIN}" --csharp_out=. --grpc_out=. -I . testcodegen.proto ls *.cs diff --git a/test/distrib/csharp/test_codegen/testcodegen.proto b/test/distrib/csharp/test_codegen/testcodegen.proto new file mode 100644 index 0000000000..5c228b81db --- /dev/null +++ b/test/distrib/csharp/test_codegen/testcodegen.proto @@ -0,0 +1,29 @@ +// Copyright 2018 The gRPC Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +syntax = "proto3"; + +package testcodegen; + +service Greeter { + rpc SayHello (HelloRequest) returns (HelloReply) {} +} + +message HelloRequest { + string name = 1; +} + +message HelloReply { + string message = 1; +} -- cgit v1.2.3