1 files changed, 38 insertions, 30 deletions

diff --git a/vendor/google.golang.org/grpc/Makefile b/vendor/google.golang.org/grpc/Makefile
index 03bb01f..41a754f 100644
--- a/vendor/google.golang.org/grpc/Makefile
+++ b/vendor/google.golang.org/grpc/Makefile
@@ -1,52 +1,60 @@
-all: test testrace
-
-deps:
-        go get -d -v google.golang.org/grpc/...
-
-updatedeps:
-        go get -d -v -u -f google.golang.org/grpc/...
-
-testdeps:
-        go get -d -v -t google.golang.org/grpc/...
-
-updatetestdeps:
-        go get -d -v -t -u -f google.golang.org/grpc/...
+all: vet test testrace testappengine
 
 build: deps
         go build google.golang.org/grpc/...
 
+clean:
+        go clean -i google.golang.org/grpc/...
+
+deps:
+        go get -d -v google.golang.org/grpc/...
+
 proto:
         @ if ! which protoc > /dev/null; then \
                 echo "error: protoc not installed" >&2; \
                 exit 1; \
         fi
-        go get -u -v github.com/golang/protobuf/protoc-gen-go
-        # use $$dir as the root for all proto files in the same directory
-        for dir in $$(git ls-files '*.proto' | xargs -n1 dirname | uniq); do \
-                protoc -I $$dir --go_out=plugins=grpc:$$dir $$dir/*.proto; \
-        done
+        go generate google.golang.org/grpc/...
 
 test: testdeps
-        go test -v -cpu 1,4 google.golang.org/grpc/...
+        go test -cpu 1,4 -timeout 7m google.golang.org/grpc/...
+
+testappengine: testappenginedeps
+        goapp test -cpu 1,4 -timeout 7m google.golang.org/grpc/...
+
+testappenginedeps:
+        goapp get -d -v -t -tags 'appengine appenginevm' google.golang.org/grpc/...
+
+testdeps:
+        go get -d -v -t google.golang.org/grpc/...
 
 testrace: testdeps
-        go test -v -race -cpu 1,4 google.golang.org/grpc/...
+        go test -race -cpu 1,4 -timeout 7m google.golang.org/grpc/...
 
-clean:
-        go clean -i google.golang.org/grpc/...
+updatedeps:
+        go get -d -v -u -f google.golang.org/grpc/...
+
+updatetestdeps:
+        go get -d -v -t -u -f google.golang.org/grpc/...
+
+vet: vetdeps
+        ./vet.sh
 
-coverage: testdeps
-        ./coverage.sh --coveralls
+vetdeps:
+        ./vet.sh -install
 
 .PHONY: \
         all \
-        deps \
-        updatedeps \
-        testdeps \
-        updatetestdeps \
         build \
+        clean \
+        deps \
         proto \
         test \
+        testappengine \
+        testappenginedeps \
+        testdeps \
         testrace \
-        clean \
-        coverage
+        updatedeps \
+        updatetestdeps \
+        vet \
+        vetdeps