1 |
commit: b0a4d64b670d0a2f93932dc0db3fe43ef9b97ad0 |
2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 2 23:05:02 2016 +0000 |
4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 2 23:10:42 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0a4d64b |
7 |
|
8 |
dev-util/checkstyle: Make the tests actually run |
9 |
|
10 |
They previously weren't being run due to a problem location |
11 |
junit. Includes a quick and dirty workaround to avoid test breakages |
12 |
from using jars within ~/.m2. |
13 |
|
14 |
Package-Manager: portage-2.2.26 |
15 |
|
16 |
dev-util/checkstyle/checkstyle-5.5-r1.ebuild | 15 ++++++--------- |
17 |
1 file changed, 6 insertions(+), 9 deletions(-) |
18 |
|
19 |
diff --git a/dev-util/checkstyle/checkstyle-5.5-r1.ebuild b/dev-util/checkstyle/checkstyle-5.5-r1.ebuild |
20 |
index 7a81a42..93a4a64 100644 |
21 |
--- a/dev-util/checkstyle/checkstyle-5.5-r1.ebuild |
22 |
+++ b/dev-util/checkstyle/checkstyle-5.5-r1.ebuild |
23 |
@@ -1,4 +1,4 @@ |
24 |
-# Copyright 1999-2015 Gentoo Foundation |
25 |
+# Copyright 1999-2016 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
# $Id$ |
28 |
|
29 |
@@ -8,7 +8,7 @@ JAVA_PKG_IUSE="doc source test" |
30 |
|
31 |
inherit java-pkg-2 java-ant-2 |
32 |
|
33 |
-DESCRIPTION="A development tool to help programmers write Java code that adheres to a coding standard" |
34 |
+DESCRIPTION="Development tool to help write Java code that adheres to a coding standard" |
35 |
HOMEPAGE="https://github.com/checkstyle/checkstyle" |
36 |
SRC_URI="mirror://sourceforge/checkstyle/${P}-src.tar.gz |
37 |
https://dev.gentoo.org/~sera/distfiles/${PN}-5.4-maven-build.xml.tar.bz2" |
38 |
@@ -29,11 +29,7 @@ RDEPEND="${COMMON_DEP} |
39 |
>=virtual/jre-1.6" |
40 |
DEPEND="${COMMON_DEP} |
41 |
>=virtual/jdk-1.6 |
42 |
- dev-java/ant-nodeps:0 |
43 |
- test? ( |
44 |
- dev-java/ant-junit |
45 |
- dev-java/junit:4 |
46 |
- )" |
47 |
+ test? ( dev-java/ant-junit:0 )" |
48 |
|
49 |
java_prepare() { |
50 |
cp ../${PN}-5.4/maven-build.xml . || die |
51 |
@@ -55,11 +51,12 @@ JAVA_ANT_ENCODING="iso-8859-1" |
52 |
EANT_BUILD_XML="maven-build.xml" |
53 |
EANT_GENTOO_CLASSPATH="ant-core,antlr,commons-beanutils-1.7,commons-cli-1,commons-logging,guava-18" |
54 |
EANT_BUILD_TARGET="package" |
55 |
-EANT_ANT_TASKS="ant-nodeps" |
56 |
EANT_NEEDS_TOOLS="true" |
57 |
|
58 |
+EANT_EXTRA_ARGS="-Dmaven.repo.local=/dev/null" |
59 |
+EANT_TEST_EXTRA_ARGS="${EANT_EXTRA_ARGS} -Djunit.present=true" |
60 |
+ |
61 |
src_test() { |
62 |
- EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4" |
63 |
java-pkg-2_src_test |
64 |
} |