aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Feng Xiao <xfxyjwf@gmail.com>2017-09-12 12:00:20 -0700
committerGravatar Feng Xiao <xfxyjwf@gmail.com>2017-09-13 17:04:13 -0700
commit8136ccb296814e22017ff91d260f0c1d02701486 (patch)
tree7320e7602fa3a71cf9d8002fff1cb10021b61faa
parented0a07eadde7b6705e382a0f336c335343c804a4 (diff)
Fix go example test.
It needs "-I" flag to find imported file google/protobuf/timestamp.proto
-rw-r--r--examples/Makefile6
-rwxr-xr-xtests.sh2
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() {