From 8136ccb296814e22017ff91d260f0c1d02701486 Mon Sep 17 00:00:00 2001 From: Feng Xiao Date: Tue, 12 Sep 2017 12:00:20 -0700 Subject: Fix go example test. It needs "-I" flag to find imported file google/protobuf/timestamp.proto --- examples/Makefile | 6 +++--- tests.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/Makefile b/examples/Makefile index 3b61790b..1ff7fa7f 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -22,12 +22,12 @@ clean: rmdir com 2>/dev/null || true protoc_middleman: addressbook.proto - protoc --cpp_out=. --java_out=. --python_out=. addressbook.proto + protoc $$PROTO_PATH --cpp_out=. --java_out=. --python_out=. addressbook.proto @touch protoc_middleman protoc_middleman_go: addressbook.proto - mkdir tutorial # make directory for go package - protoc --go_out=tutorial addressbook.proto + mkdir -p tutorial # make directory for go package + protoc $$PROTO_PATH --go_out=tutorial addressbook.proto @touch protoc_middleman_go add_person_cpp: add_person.cc protoc_middleman diff --git a/tests.sh b/tests.sh index 5aba663d..689b8913 100755 --- a/tests.sh +++ b/tests.sh @@ -129,7 +129,7 @@ build_golang() { export PATH="$GOPATH/bin:$PATH" go get github.com/golang/protobuf/protoc-gen-go - cd examples && make gotest && cd .. + cd examples && PROTO_PATH="-I../src -I." make gotest && cd .. } use_java() { -- cgit v1.2.3