1 |
commit: 2e2c1f402085a6a19c259a51642bbdf4fe5cd72b |
2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Mar 31 07:50:48 2016 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Mar 31 07:54:58 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e2c1f40 |
7 |
|
8 |
dev-go/go-crypto: fix tests for bug 577908 |
9 |
|
10 |
Package-Manager: portage-2.2.28 |
11 |
|
12 |
dev-go/go-crypto/go-crypto-0_pre20160126.ebuild | 24 +++++++++--------------- |
13 |
1 file changed, 9 insertions(+), 15 deletions(-) |
14 |
|
15 |
diff --git a/dev-go/go-crypto/go-crypto-0_pre20160126.ebuild b/dev-go/go-crypto/go-crypto-0_pre20160126.ebuild |
16 |
index 79bc5a2..799b98b 100644 |
17 |
--- a/dev-go/go-crypto/go-crypto-0_pre20160126.ebuild |
18 |
+++ b/dev-go/go-crypto/go-crypto-0_pre20160126.ebuild |
19 |
@@ -24,25 +24,19 @@ IUSE="" |
20 |
DEPEND="" |
21 |
RDEPEND="" |
22 |
|
23 |
-src_prepare() { |
24 |
- # disable broken tests |
25 |
- sed -e 's:TestAgentForward(:_\0:' \ |
26 |
- -i src/${EGO_SRC}/ssh/test/agent_unix_test.go || die |
27 |
- sed -e 's:TestRunCommandSuccess(:_\0:' \ |
28 |
- -e 's:TestRunCommandStdin(:_\0:' \ |
29 |
- -e 's:TestRunCommandStdinError(:_\0:' \ |
30 |
- -e 's:TestRunCommandWeClosed(:_\0:' \ |
31 |
- -e 's:TestFuncLargeRead(:_\0:' \ |
32 |
- -e 's:TestKeyChange(:_\0:' \ |
33 |
- -e 's:TestValidTerminalMode(:_\0:' \ |
34 |
- -i src/${EGO_SRC}/ssh/test/session_test.go || die |
35 |
-} |
36 |
- |
37 |
src_compile() { |
38 |
# Create a writable GOROOT in order to avoid sandbox violations. |
39 |
cp -sR "$(go env GOROOT)" "${T}/goroot" || die |
40 |
rm -rf "${T}/goroot/src/${EGO_SRC}" || die |
41 |
rm -rf "${T}/goroot/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_SRC}" || die |
42 |
export GOROOT="${T}/goroot" |
43 |
- golang-build_src_compile |
44 |
+ # Exclude $(get_golibdir_gopath) from GOPATH, for bug 577908 which may |
45 |
+ # or may not manifest, depending on what libraries are installed. |
46 |
+ export GOPATH="${WORKDIR}/${P}" |
47 |
+ go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die |
48 |
+} |
49 |
+ |
50 |
+src_test() { |
51 |
+ # Exclude $(get_golibdir_gopath) from GOPATH |
52 |
+ go test -v -work -x "${EGO_PN}" |
53 |
} |