[gentoo-commits] repo/gentoo:master commit in: dev-go/go-tools/

[Zac Medico]

commit:     adbb2eb4a2521ace1359808a05f8832248bf88d3
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 11 19:03:06 2015 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Sep 11 19:04:10 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adbb2eb4

dev-go/go-tools: fix tests and src_prepare failure for 0_pre20150902

Package-Manager: portage-2.2.20.1

 dev-go/go-tools/go-tools-0_pre20150902.ebuild | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/dev-go/go-tools/go-tools-0_pre20150902.ebuild 
b/dev-go/go-tools/go-tools-0_pre20150902.ebuild
index aa176ff..7d598bd 100644
--- a/dev-go/go-tools/go-tools-0_pre20150902.ebuild
+++ b/dev-go/go-tools/go-tools-0_pre20150902.ebuild
@@ -56,8 +56,6 @@ src_prepare() {
                -i src/${go_src}/go/types/stdlib_test.go || die
        sed -e 's:TestRepoRootForImportPath(:_\0:' \
                -i src/${go_src}/go/vcs/vcs_test.go || die
-       sed -e 's:TestStdlib(:_\0:' \
-       -i src/${go_src}/refactor/lexical/lexical_test.go || die
 
        # Add favicon to the godoc web interface (bug 551030)
        cp "${DISTDIR}"/go-favicon.ico "src/${go_src}/godoc/static/favicon.ico" 
||
@@ -77,6 +75,14 @@ src_compile() {
        golang-build_src_compile
 }
 
+src_test() {
+       # Create a writable GOROOT in order to avoid sandbox violations.
+       cp -sR "$(go env GOROOT)" "${T}/goroot" || die
+       mkdir -p "${T}/goroot/test" || die
+       GOROOT="${T}/goroot" golang-build_src_test
+       rm -rf "${T}/goroot"
+}
+
 src_install() {
        # Create a writable GOROOT in order to avoid sandbox violations.
        cp -sR "$(go env GOROOT)" "${T}/goroot" || die