THRIFT-3194 Can't build with go enabled. gomock SCC path incorrect.

Client: Go
Patch: Larry Matter <larry.matter@gmail.com>

This closes #524
This commit is contained in:
Jens Geyer 2015-06-19 21:22:57 +02:00
parent 56a03be3f9
commit 8b4700265c
2 changed files with 3 additions and 3 deletions

2
.gitignore vendored
View File

@ -238,7 +238,7 @@ test-driver
/test/go/ThriftTest.thrift
/test/go/gopath
/test/go/pkg/
/test/go/src/code.google.com/
/test/go/src/github.com/golang/
/test/go/src/gen/
/test/go/src/thrift
/test/haxe/bin

View File

@ -47,7 +47,7 @@ bin/stress: gopath
GOPATH=`pwd` $(GO) install bin/stress
clean-local:
$(RM) -r src/gen src/code.google.com src/thrift bin pkg gopath ThriftTest.thrift
$(RM) -r src/gen src/github.com/golang src/thrift bin pkg gopath ThriftTest.thrift
check_PROGRAMS: bin/testclient bin/testserver bin/stress
@ -55,7 +55,7 @@ check: gopath
GOPATH=`pwd` $(GO) test -v common/...
genmock: gopath
GOPATH=`pwd` $(GO) install code.google.com/p/gomock/mockgen
GOPATH=`pwd` $(GO) install github.com/golang/mock/mockgen
GOPATH=`pwd` bin/mockgen -destination=src/common/mock_handler.go -package=common gen/thrifttest ThriftTest
EXTRA_DIST = \