From 047dfb9614767096bff53c847385fc04df7428f7 Mon Sep 17 00:00:00 2001 From: Choko Date: Wed, 27 Jul 2022 18:06:38 +0900 Subject: [PATCH] Enable grpc_objc on windows --- protog_test.go | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/protog_test.go b/protog_test.go index f8e387d..cc08935 100644 --- a/protog_test.go +++ b/protog_test.go @@ -3,7 +3,6 @@ package protog import ( "io/fs" "path/filepath" - "runtime" "strings" "testing" @@ -25,6 +24,8 @@ func TestRun(t *testing.T) { filepath.Join("java", "io", "grpc", "examples", "helloworld", "GreeterGrpc.java"), filepath.Join("objc", "Helloworld.pbobjc.h"), filepath.Join("objc", "Helloworld.pbobjc.m"), + filepath.Join("objc", "Helloworld.pbrpc.h"), + filepath.Join("objc", "Helloworld.pbrpc.m"), filepath.Join("php", "Helloworld", "GreeterClient.php"), filepath.Join("php", "Helloworld", "HelloReply.php"), filepath.Join("php", "Helloworld", "HelloRequest.php"), @@ -36,14 +37,6 @@ func TestRun(t *testing.T) { filepath.Join("doc", "index.html"), } - if runtime.GOOS != "windows" { - // grpc_objective_c_plugin crashes on Windows - expectedFilesNoJS = append(expectedFilesNoJS, - filepath.Join("objc", "Helloworld.pbrpc.h"), - filepath.Join("objc", "Helloworld.pbrpc.m"), - ) - } - argsNoJS := func(dir string) []string { args := []string{ "--cpp_out=" + filepath.Join(dir, "cpp"), @@ -60,6 +53,7 @@ func TestRun(t *testing.T) { "--python_out=" + filepath.Join(dir, "python"), "--grpc_python_out=" + filepath.Join(dir, "python"), "--objc_out=" + filepath.Join(dir, "objc"), + "--grpc_objc_out=" + filepath.Join(dir, "objc"), "--ruby_out=" + filepath.Join(dir, "ruby"), "--grpc_ruby_out=" + filepath.Join(dir, "ruby"), "--ts_out=" + filepath.Join(dir, "ts"), @@ -70,12 +64,6 @@ func TestRun(t *testing.T) { filepath.Join("testdata", "helloworld.proto"), } - if runtime.GOOS != "windows" { - args = append(args, - "--grpc_objc_out="+filepath.Join(dir, "objc"), - ) - } - return args }