summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiroslav Šulc <fordfrog@gentoo.org>2011-12-30 12:14:33 +0000
committerMiroslav Šulc <fordfrog@gentoo.org>2011-12-30 12:14:33 +0000
commite55161cc3fae3e63813e7f644646e074c7fc2e34 (patch)
tree01bfe5944a76d3dbdfd94031f8af711cf5eb7adc /dev-java/junit
parentold (diff)
downloadhistorical-e55161cc3fae3e63813e7f644646e074c7fc2e34.tar.gz
historical-e55161cc3fae3e63813e7f644646e074c7fc2e34.tar.bz2
historical-e55161cc3fae3e63813e7f644646e074c7fc2e34.zip
dev-java/junit: fixed bug #396367
Package-Manager: portage-2.1.10.44/cvs/Linux x86_64
Diffstat (limited to 'dev-java/junit')
-rw-r--r--dev-java/junit/ChangeLog6
-rw-r--r--dev-java/junit/Manifest4
-rw-r--r--dev-java/junit/junit-4.10.ebuild4
3 files changed, 9 insertions, 5 deletions
diff --git a/dev-java/junit/ChangeLog b/dev-java/junit/ChangeLog
index 0e44a8185461..618566c4b251 100644
--- a/dev-java/junit/ChangeLog
+++ b/dev-java/junit/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/junit
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/ChangeLog,v 1.63 2011/12/25 21:42:29 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/ChangeLog,v 1.64 2011/12/30 12:14:33 fordfrog Exp $
+
+ 30 Dec 2011; Miroslav Šulc <fordfrog@gentoo.org> junit-4.10.ebuild:
+ Fixed failing tests (bug #396367, thanks to Xake >xake@rymdraket.net> for the
+ fix)
*junit-4.10 (25 Dec 2011)
diff --git a/dev-java/junit/Manifest b/dev-java/junit/Manifest
index dc9e819cc10b..60ca86b3cebc 100644
--- a/dev-java/junit/Manifest
+++ b/dev-java/junit/Manifest
@@ -5,8 +5,8 @@ DIST junit4.10.zip 1781594 RMD160 ec69fd1e1fa8c1fc88c0aa9c105f1bdc0b7a4720 SHA1
DIST junit4.6.zip 1259346 RMD160 4f87024e91b7252af89ad925db5cda0e17128525 SHA1 98c8c625e999f0c7463397a684a5c47a0ea106e3 SHA256 fa0acd11fab2b1b0cd57dd0bc7fdb4e7084d2e1a3ade7bc2c54a0f397f989b26
DIST junit4.8.2.zip 1594318 RMD160 fe476a8027471bcc2cc7ccc93001947222aced83 SHA1 15209b0933816c8e940a8375459be6e61e5f1662 SHA256 c677cc9a08683848299f0e67fe313415de5cbaae5bfd7dee11f7d53bd8ae5107
EBUILD junit-3.8.2-r1.ebuild 1135 RMD160 7c76b6c516016e709ffd50cb282f4828aab8ee7e SHA1 336961975849a18b91456a448308367cdbe393f9 SHA256 19c67667425cca781a5d15974572866edf31811fd1db5e6dcb8d23aa2f0d12bc
-EBUILD junit-4.10.ebuild 2612 RMD160 40f23befcc6df618023f5446bc435ffe6a33a724 SHA1 e43afec8812ddf1f7b1a3fe5d563f8fba289e629 SHA256 6f7929388bceaca72e140cc98398c02bbb0b3c5316b05e869cf439d38ac6871b
+EBUILD junit-4.10.ebuild 2628 RMD160 72afd7b72086d0945ca2423263564b3df702ab62 SHA1 f07475ad3a9b46759858d97f1435760d7f2c50e9 SHA256 a4bc5664f479a3812bc017c83002c2b3318795dfdf54984e32c46a219bfb2711
EBUILD junit-4.6.ebuild 2178 RMD160 ca5b8bd6f4b3b02f0848c07cc11e0c6b9844097f SHA1 2beb3ebc5c51c1d2e41a9a4f2cb400c5086f6693 SHA256 9fb4218f2a227348b9ad27547896d9f4025b245cf06a8d52e8d2baf3b0eea1df
EBUILD junit-4.8.2-r1.ebuild 2615 RMD160 20f9b378c4e41e517e38edf052d90fd178145244 SHA1 e06dc8cd4635104e6de5168f230047ebb2f457c9 SHA256 1f619f76964fe24ae5c4fefe47ae7d0e05f7181132d543c943f0bf780b95bc93
-MISC ChangeLog 8514 RMD160 5525458a3191b8d4f366aceae27d793eb81bad11 SHA1 59e4de23b362383b30ae8e01a7d4784f19c0a12e SHA256 0da63eb10ea9daaf2b204b390745184c8d732e8d884cb37f41e4907f501d432e
+MISC ChangeLog 8673 RMD160 762ff338ea7ef3ba0f07a0a9dafa64752b4727fa SHA1 ec0b5f59bad1b3b20fa75a776e4cf15abaca8de9 SHA256 c430879e1c8bb57ee2adbe66206ee47462b00c29317f2e5395285296d215fdbc
MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
diff --git a/dev-java/junit/junit-4.10.ebuild b/dev-java/junit/junit-4.10.ebuild
index 113a95c78bc0..8746d785e4df 100644
--- a/dev-java/junit/junit-4.10.ebuild
+++ b/dev-java/junit/junit-4.10.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/junit-4.10.ebuild,v 1.1 2011/12/25 21:42:29 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/junit-4.10.ebuild,v 1.2 2011/12/30 12:14:33 fordfrog Exp $
# WARNING: JUNIT.JAR IS _NOT_ SYMLINKED TO ANT-CORE LIB FOLDER AS JUNIT3 IS
@@ -67,7 +67,7 @@ src_test() {
mkdir classes || die "Unable to create build directory for tests"
local cp=$(java-pkg_getjars hamcrest-core):${S}/${PN}${PV}/${PN}-dep-${PV}.jar
- ejavac -classpath ${cp} -d classes $(find junit/tests -name "*.java")
+ ejavac -classpath ${cp} -d classes $(find junit/tests org/junit/tests -name "*.java")
java -classpath ${cp}:classes org.junit.runner.JUnitCore junit.tests.AllTests \
|| die "Tests failed."