diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2017-09-13 17:57:10 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-13 17:57:10 -0700 |
| commit | d1bc27caef8377a710370189675cb0958443e8f1 (patch) | |
| tree | f61dfbae1ce0b31ae7305f1a8263e8a2ccceaa87 | |
| parent | c0d88ae300af82b4e0717203a4c6baaff05a9c3f (diff) | |
| parent | 8136ccb296814e22017ff91d260f0c1d02701486 (diff) | |
| download | protobuf-d1bc27caef8377a710370189675cb0958443e8f1.tar.gz protobuf-d1bc27caef8377a710370189675cb0958443e8f1.tar.bz2 protobuf-d1bc27caef8377a710370189675cb0958443e8f1.zip | |
Merge pull request #3626 from xfxyjwf/fixgo
Fix go example test.
| -rw-r--r-- | examples/Makefile | 6 | ||||
| -rwxr-xr-x | 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 @@ -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() { |