From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 6974613989A for ; Thu, 27 Aug 2015 09:24:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 01001141EC; Thu, 27 Aug 2015 09:24:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8A268141EC for ; Thu, 27 Aug 2015 09:24:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8509C340A36 for ; Thu, 27 Aug 2015 09:24:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B468313B for ; Thu, 27 Aug 2015 09:24:30 +0000 (UTC) From: "Patrice Clement" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrice Clement" Message-ID: <1440671065.a454bc9baa8794a3aaa4e86f0bc30473cf9982da.monsieurp@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/jdom/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/jdom/jdom-2.0.6-r3.ebuild X-VCS-Directories: dev-java/jdom/ X-VCS-Committer: monsieurp X-VCS-Committer-Name: Patrice Clement X-VCS-Revision: a454bc9baa8794a3aaa4e86f0bc30473cf9982da X-VCS-Branch: master Date: Thu, 27 Aug 2015 09:24:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 750600c9-81d2-4883-87de-b8bfa97a5d0d X-Archives-Hash: 6ae06ef76fe4524471b007996023f41c commit: a454bc9baa8794a3aaa4e86f0bc30473cf9982da Author: Patrice Clement gentoo org> AuthorDate: Thu Aug 27 10:22:58 2015 +0000 Commit: Patrice Clement gentoo org> CommitDate: Thu Aug 27 10:24:25 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a454bc9b dev-java/jdom: rework src_test function and the whole tests handling reasoning. Package-Manager: portage-2.2.18 Signed-off-by: Patrice Clement gentoo.org> dev-java/jdom/jdom-2.0.6-r3.ebuild | 118 +++++++++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+) diff --git a/dev-java/jdom/jdom-2.0.6-r3.ebuild b/dev-java/jdom/jdom-2.0.6-r3.ebuild new file mode 100644 index 0000000..be6ed0e --- /dev/null +++ b/dev-java/jdom/jdom-2.0.6-r3.ebuild @@ -0,0 +1,118 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +JAVA_PKG_IUSE="source test doc" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Java API to manipulate XML data" +SRC_URI="http://www.jdom.org/dist/binary/${P}.zip" +HOMEPAGE="http://www.jdom.org" +LICENSE="JDOM" +SLOT="2" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" + +CDEPEND=" + test? ( + dev-java/junit:4 + ) + dev-java/xalan:0 + dev-java/jaxen:1.1 + dev-java/iso-relax:0 + dev-java/xml-commons-external:1.4" +RDEPEND=">=virtual/jre-1.6 + ${CDEPEND}" +DEPEND=">=virtual/jdk-1.6 + app-arch/unzip + ${CDEPEND}" +IUSE="" + +S="${WORKDIR}" + +JAVA_GENTOO_CLASSPATH="xalan,jaxen-1.1,iso-relax,xml-commons-external-1.4" +JAVA_SRC_DIR="org" + +# Dubious tests: +# They either do not pass or don't have runnable methods (i.e. tests) +UNIT_TESTS=( + org/jdom2/test/cases/input/sax/TestXMLReaderSAX2Factory.java + org/jdom2/test/cases/input/sax/TestXMLReaderSingletons.java + org/jdom2/test/cases/input/sax/TestXMLReaderXSDFactory.java + org/jdom2/test/cases/input/sax/TestXMLReaderJAXPFactory.java + org/jdom2/test/cases/input/sax/TestXMLReaderSchemaFactory.java + org/jdom2/test/cases/input/TestSAXComplexSchema.java + org/jdom2/test/cases/input/TestSAXBuilder.java + org/jdom2/test/cases/input/TestSAXHandler.java + org/jdom2/test/cases/input/TestDOMBuilder.java + org/jdom2/test/cases/input/TestDTDParser.java + org/jdom2/test/cases/input/TestJDOMParseExceptn.java + org/jdom2/test/cases/input/TestStAXEventBuilder.java + org/jdom2/test/cases/input/TestBuilderErrorHandler.java + org/jdom2/test/cases/input/TestStAXStreamBuilder.java + org/jdom2/test/cases/input/HelpTestDOMBuilder.java + org/jdom2/test/cases/special/TestIssue008ExpandEntity.java + org/jdom2/test/cases/located/TestLocatedJDOMFactory.java + org/jdom2/test/cases/xpath/TestJaxenXPathHelper.java + org/jdom2/test/cases/xpath/TestDefaultXPathHelper.java +) + +src_unpack() { + default + cd "${S}" + unpack ./"${P}-sources".jar +} + +java_prepare() { + find "${S}"/lib -type f -delete || die + if use test; then + JAVA_GENTOO_CLASSPATH+=",junit-4" + else + # Override the array with different files. + UNIT_TESTS=( + org/jdom2/test + org/jdom2/Test*.java + org/jdom2/contrib/android/TranslateTests.java + org/jdom2/input/sax/TestTextBuffer.java + ) + fi + + rm -rf "${UNIT_TESTS[@]}" || die +} + +src_compile() { + java-pkg-simple_src_compile +} + +src_install() { + java-pkg-simple_src_install + use source && java-pkg_dosrc org +} + +src_test() { + local DIR="org/jdom2/test" + local CP="${DIR}:${PN}.jar:$(java-pkg_getjars junit-4,${JAVA_GENTOO_CLASSPATH})" + local TESTS=() + + while read -d $'\0' -r file; do + basefile=$(basename ${file}) + { + # Skip if starts with Abstract + [[ ${basefile} =~ ^Abstract ]] || \ + # Skip if doesn't starts with Test + [[ ! ${basefile} =~ ^Test ]] || \ + # Skip if doesn't end with the .java extension + [[ ! ${basefile} =~ \.java$ ]] + } && continue + TESTS+=(${file}) + done < <(find "${DIR}" -type f -print0) + + # Turn ${TESTS[@}} array into a string + TESTS="${TESTS[@]}" + TESTS="${TESTS//src\/test\/java\/}" + TESTS="${TESTS//.java}" + TESTS="${TESTS//\//.}" + + ejunit4 -classpath "${CP}" ${TESTS} +}