Disable broken tests.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xFDE8EF85AE5719A3

4 files changed, 59 insertions, 19 deletions

diff --git a/dev-go/go-tools/ChangeLog b/dev-go/go-tools/ChangeLog
index 62384760a0bb..94bb2f1cab42 100644
--- a/dev-go/go-tools/ChangeLog
+++ b/dev-go/go-tools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-go/go-tools
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-go/go-tools/ChangeLog,v 1.4 2015/05/21 08:28:23 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-go/go-tools/ChangeLog,v 1.5 2015/05/24 09:31:50 zmedico Exp $
+
+  24 May 2015; Zac Medico <zmedico@gentoo.org> go-tools-1.4.2_p20150520.ebuild,
+  go-tools-9999.ebuild:
+  Disable broken tests.
 
   21 May 2015; Zac Medico <zmedico@gentoo.org> go-tools-1.4.2_p20150520.ebuild:
   Remove unused git-r3 inherit.
diff --git a/dev-go/go-tools/Manifest b/dev-go/go-tools/Manifest
index dce245a8d8af..a859328ee0f1 100644
--- a/dev-go/go-tools/Manifest
+++ b/dev-go/go-tools/Manifest
@@ -2,14 +2,14 @@
 Hash: SHA256
 
 DIST go-tools-1.4.2_p20150520.tar.gz 1625986 SHA256 ea5cdf7c19b250c2e98b136ff993d1ecbfb66b052c7ac748a03f99eedf676f99 SHA512 1a3fd27fb79d449f876823f032f1a4a00bbb83cf8e9c370634910e76cdcb3c0e4b5fbad6b6012e928e82c7c986a1dadc60c49f2b6021730952725dc32e3cea3d WHIRLPOOL 641d95c9dccf7194a38ee767cb2cf54c91f676a271ef7113df2b05ffaeed7c2afeddd2a1ab005a80f035762cf502b57e336948cc55e1a7ab0d7b625779555183
-EBUILD go-tools-1.4.2_p20150520.ebuild 1683 SHA256 1ef3342e590fae598d17adad3e2be9d430b89b942c230a87f7c886717a7300f9 SHA512 6ddf7e7af9b1e0b4f15a4a1307d6b72ef08333a809078c1ed34c63fd96673b07bc5763f85b38020ee7fb5f714a66c79403d29503f6e6ada6d5c9938188432b45 WHIRLPOOL 59256e1b6a77b6c03ac6662e5449c322daa6376ec875703a294e8e7bf303cc64ae12d905b7ff9bb66430815fd602d966137844b8b1c49fb6764ba7e8baa88a98
-EBUILD go-tools-9999.ebuild 1467 SHA256 b950b1706d65a9546198cec4f561b0085a1e8ed88e58fe9f0430bc238dd8ae53 SHA512 edbf5c947ad30607f505991c6154619d4d3fce94eeeda3209455c3073901ce1e606e2207bf4b58079c509baf96de4c4e0d2505d7e37c61bbef91fa02a8b5ba59 WHIRLPOOL ea9b6d106898f3291c7e8b99ae0de72644373d22a751b0632f21a2f7a128738ea867f35fe21da1f4174212a430b78bb44f381de330a1eefb60466556ba6ec70d
-MISC ChangeLog 691 SHA256 2f075dcdefa052ea8bb0f9801ec40ec1b5fc8866af75a1e2bc5e777db59d71ee SHA512 afbfe1bf7f43c0b8e2614766cba3f4463484f7657ed310dd37e3bef9c2c16e72d1ab42361b5943fa4043542c002ea30e1ebbd2473f6ebb4fc4f1a5edc3b8aad8 WHIRLPOOL a8d04239667233f0b387774afdf3964056a042447039a05a69448e07d9358fb837402cdb8661486c171285ea41486683b62abdb919a74a003409ec14fb006464
+EBUILD go-tools-1.4.2_p20150520.ebuild 2484 SHA256 5e122b62bf287b26df100e20529a57b06f6501b39033b5549becec961e3b537e SHA512 0e64701a49241deb62551374beac8067fbb81dd0fb6d3cd6c689d46f7d59da2c6a270ab3df046aceb5bc8238fb2b4c9119c4a565184c3d7783401efd6b71ebf1 WHIRLPOOL 929b73f3ad0e6830a2703bba008b612f3fe662003ccf2a1d3c25649cb5634d5de821dfd2390d21a4582011b60f8e6aac26fe1a71e159bfa34c6b7cc862b233ac
+EBUILD go-tools-9999.ebuild 2268 SHA256 318198bbc0c51e7a9aaa02c6bd18602a1f3a09909efa3ae227705703f874960c SHA512 289afd00be8b89f3c0393424abec3a372c92385d6e232e8427f57aebb9c6a826ee6cc02b24e79b937694a467b30ad097941a112d6dc2a16d9b4bdd23acf21f77 WHIRLPOOL cebf9abe8ca69151480892913ecc1ae1541fe22628e31047464dd391f6bf6026da1886ad1aaec5f7eb2f67fcbea9ef2e6235d94191863d2e3dc6d73759b51d9c
+MISC ChangeLog 820 SHA256 636f34ab08a68b2323750077fa4add35939f5792bf4fd231769e8a5fcb6b06a6 SHA512 3dff948c87dcf647c9b4e402d458efdf3cbaf0ee9a0b5da27945b29076e0da4b79daf7bcd5282d9a5f13d67f10d861c80ec223a4684f99a4cce952d601bac282 WHIRLPOOL 7cefcb3391469520b88211001f7b6c54c5c7ccd7b635c39bee579369187f23165c95e4af16260c4158cc0d141cfb9d21e2965a0fa38afa51a783d88c64f57b5b
 MISC metadata.xml 208 SHA256 67f4cd233dc8d6d341b8da89aef2654cae64f7e3b62fbcdd3a35e6e30e898e36 SHA512 5213f6c100db04c6bbbf73b4e52042caf1744aa805af76053f5ecaf5f921ffdd35c41507b492da65c6071f1699472db6c9334dcd5bb7da752dca8efe7e1c7aa4 WHIRLPOOL a43dc0ecd7f37ba8cf4d510a1195338816b6193e5c5517c8e005662a06d7fb62c725a3c2981474a872cba628c268de1bea0fb67a31ae1842a252c0fdc723eb4d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlVdlygACgkQ/ejvha5XGaM77QCdHggpBrdUX5eKSMN43tywu3Ma
-b2EAnjzgGMuaYaAR4rBHpsYKxabIxvWK
-=DnRZ
+iEYEAREIAAYFAlVhmocACgkQ/ejvha5XGaO89wCg5fCyioPADYEOMwY3RcWmlu+f
+XyQAoJR8dCrexmR3QlTNqguesv4JNwtG
+=jIT8
 -----END PGP SIGNATURE-----
diff --git a/dev-go/go-tools/go-tools-1.4.2_p20150520.ebuild b/dev-go/go-tools/go-tools-1.4.2_p20150520.ebuild
index a0e3270b88dd..b4f0523b3a72 100644
--- a/dev-go/go-tools/go-tools-1.4.2_p20150520.ebuild
+++ b/dev-go/go-tools/go-tools-1.4.2_p20150520.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-go/go-tools/go-tools-1.4.2_p20150520.ebuild,v 1.2 2015/05/21 08:28:23 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-go/go-tools/go-tools-1.4.2_p20150520.ebuild,v 1.3 2015/05/24 09:31:50 zmedico Exp $
 
 EAPI=5
 
@@ -27,6 +27,28 @@ src_unpack() {
 	mv ${MY_PN}-${EGIT_COMMIT} src/${GO_PN} || die
 }
 
+src_prepare() {
+	# disable broken tests
+	sed -e 's:TestWeb(:_\0:' -i cmd/godoc/godoc_test.go || die
+	sed -e 's:TestVet(:_\0:' -i cmd/vet/vet_test.go || die
+	sed -e 's:TestImport(:_\0:' -i go/gcimporter/gcimporter_test.go || die
+	sed -e 's:TestImportStdLib(:_\0:' -i go/importer/import_test.go || die
+	sed -e 's:TestStdlib(:_\0:' -i go/loader/stdlib_test.go || die
+	sed -e 's:TestStdlib(:_\0:' -i go/ssa/stdlib_test.go || die
+	sed -e 's:TestGorootTest(:_\0:' \
+		-e 's:TestFoo(:_\0:' \
+		-e 's:TestTestmainPackage(:_\0:' \
+		-i go/ssa/interp/interp_test.go || die
+	sed -e 's:TestBar(:_\0:' \
+		-e 's:TestFoo(:_\0:' -i go/ssa/interp/testdata/a_test.go || die
+	sed -e 's:TestCheck(:_\0:' -i go/types/check_test.go || die
+	sed -e 's:TestStdlib(:_\0:' \
+		-e 's:TestStdFixed(:_\0:' \
+		-e 's:TestStdKen(:_\0:' -i go/types/stdlib_test.go || die
+	sed -e 's:TestRepoRootForImportPath(:_\0:' -i go/vcs/vcs_test.go || die
+	sed -e 's:TestStdlib(:_\0:' -i refactor/lexical/lexical_test.go || die
+}
+
 src_compile() {
 	# Create a writable GOROOT in order to avoid sandbox violations.
 	GOROOT="${WORKDIR}/goroot"
@@ -38,11 +60,7 @@ src_compile() {
 
 src_test() {
 	GOROOT="${GOROOT}" GOPATH=${WORKDIR} \
-		go test -run "^"$(
-		echo -n 'Test(ParseLine|ParseSet|SelectBest|Delta|Correlate|'
-		echo -n 'BenchCmpSorting|Callgraph-4|Cover|Digraph|Split|'
-		echo -n 'QuotedLength|FixImports|DryRun)$') \
-		-x -v ${GO_PN}/... || die $?
+		go test -x -v ${GO_PN}/... || die $?
 }
 
 src_install() {
diff --git a/dev-go/go-tools/go-tools-9999.ebuild b/dev-go/go-tools/go-tools-9999.ebuild
index 1bb30626873a..669c73e54218 100644
--- a/dev-go/go-tools/go-tools-9999.ebuild
+++ b/dev-go/go-tools/go-tools-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-go/go-tools/go-tools-9999.ebuild,v 1.2 2015/05/21 07:18:42 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-go/go-tools/go-tools-9999.ebuild,v 1.3 2015/05/24 09:31:50 zmedico Exp $
 
 EAPI=5
 inherit git-r3
@@ -20,6 +20,28 @@ S="${WORKDIR}/src/${GO_PN}"
 EGIT_CHECKOUT_DIR="${S}"
 STRIP_MASK="*.a"
 
+src_prepare() {
+	# disable broken tests
+	sed -e 's:TestWeb(:_\0:' -i cmd/godoc/godoc_test.go || die
+	sed -e 's:TestVet(:_\0:' -i cmd/vet/vet_test.go || die
+	sed -e 's:TestImport(:_\0:' -i go/gcimporter/gcimporter_test.go || die
+	sed -e 's:TestImportStdLib(:_\0:' -i go/importer/import_test.go || die
+	sed -e 's:TestStdlib(:_\0:' -i go/loader/stdlib_test.go || die
+	sed -e 's:TestStdlib(:_\0:' -i go/ssa/stdlib_test.go || die
+	sed -e 's:TestGorootTest(:_\0:' \
+		-e 's:TestFoo(:_\0:' \
+		-e 's:TestTestmainPackage(:_\0:' \
+		-i go/ssa/interp/interp_test.go || die
+	sed -e 's:TestBar(:_\0:' \
+		-e 's:TestFoo(:_\0:' -i go/ssa/interp/testdata/a_test.go || die
+	sed -e 's:TestCheck(:_\0:' -i go/types/check_test.go || die
+	sed -e 's:TestStdlib(:_\0:' \
+		-e 's:TestStdFixed(:_\0:' \
+		-e 's:TestStdKen(:_\0:' -i go/types/stdlib_test.go || die
+	sed -e 's:TestRepoRootForImportPath(:_\0:' -i go/vcs/vcs_test.go || die
+	sed -e 's:TestStdlib(:_\0:' -i refactor/lexical/lexical_test.go || die
+}
+
 src_compile() {
 	# Create a writable GOROOT in order to avoid sandbox violations.
 	GOROOT="${WORKDIR}/goroot"
@@ -31,11 +53,7 @@ src_compile() {
 
 src_test() {
 	GOROOT="${GOROOT}" GOPATH=${WORKDIR} \
-		go test -run "^"$(
-		echo -n 'Test(ParseLine|ParseSet|SelectBest|Delta|Correlate|'
-		echo -n 'BenchCmpSorting|Callgraph-4|Cover|Digraph|Split|'
-		echo -n 'QuotedLength|FixImports|DryRun)$') \
-		-x -v ${GO_PN}/... || die $?
+		go test -x -v ${GO_PN}/... || die $?
 }
 
 src_install() {