Repository: thrift Updated Branches: refs/heads/master 56a03be3f -> 8b4700265
THRIFT-3194 Can't build with go enabled. gomock SCC path incorrect. Client: Go Patch: Larry Matter <[email protected]> This closes #524 Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/8b470026 Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/8b470026 Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/8b470026 Branch: refs/heads/master Commit: 8b4700265cef54c6544345530b33cd2274caec62 Parents: 56a03be Author: Jens Geyer <[email protected]> Authored: Fri Jun 19 21:22:57 2015 +0200 Committer: Jens Geyer <[email protected]> Committed: Fri Jun 19 21:22:57 2015 +0200 ---------------------------------------------------------------------- .gitignore | 2 +- test/go/Makefile.am | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/thrift/blob/8b470026/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index 2282c0f..affc17e 100644 --- a/.gitignore +++ b/.gitignore @@ -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 http://git-wip-us.apache.org/repos/asf/thrift/blob/8b470026/test/go/Makefile.am ---------------------------------------------------------------------- diff --git a/test/go/Makefile.am b/test/go/Makefile.am index cf0ed58..2b2dbce 100644 --- a/test/go/Makefile.am +++ b/test/go/Makefile.am @@ -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 = \
