Merge pull request #75 from benbjohnson/godep

Add protobuf/testdata, fix Makefile
This commit is contained in:
Travis Turner 2016-04-26 10:09:01 -05:00
commit db47b4fcde
2 changed files with 8 additions and 6 deletions

6
Godeps/Godeps.json generated
View file

@ -1,6 +1,6 @@
{
"ImportPath": "github.com/umbel/pilosa",
"GoVersion": "go1.5.1",
"GoVersion": "go1.6.2",
"Packages": [
"./..."
],
@ -21,8 +21,8 @@
},
{
"ImportPath": "github.com/gogo/protobuf/proto",
"Comment": "v0.2-9-g4365f75",
"Rev": "4365f750fe246471f2a03ef5da5231c3565c5628"
"Comment": "v0.2-10-g74b6e9d",
"Rev": "74b6e9deaff6ba6da1389ec97351d337f0d08b06"
},
{
"ImportPath": "github.com/golang/groupcache/lru",

View file

@ -1,5 +1,7 @@
.PHONY: vendor
default:
# Temporary workaround to avoid testing vendor directory.
test:
go test $(go list ./... | grep -v /vendor/)
vendor:
godep save ./...
cp -r $(GOPATH)/src/github.com/gogo/protobuf/proto/testdata vendor/github.com/gogo/protobuf/proto/testdata