commit: 15620881ab9431c1d72390b9006d67ff9ba730b9 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Fri Jun 3 14:04:53 2022 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Sun Oct 9 08:25:08 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15620881
dev-java/bcel: remove test restriction * removes test restriction and specifically excludes failing tests * tests excluded are documented in the bug Bug: https://bugs.gentoo.org/830798 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/27477 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> dev-java/bcel/Manifest | 1 + dev-java/bcel/bcel-6.5.0-r3.ebuild | 60 ++++++++++++++++++++++---------------- 2 files changed, 36 insertions(+), 25 deletions(-) diff --git a/dev-java/bcel/Manifest b/dev-java/bcel/Manifest index 293f425488f6..48f6029868a2 100644 --- a/dev-java/bcel/Manifest +++ b/dev-java/bcel/Manifest @@ -1 +1,2 @@ DIST bcel-6.5.0-sources.tar.gz 1009051 BLAKE2B fd07d8a5144112efe38e30a8d10c3b6a189a4ec70defa96c402fa88027acf84b07c15138d235354baac18bdb798d407c11ccfada7bbe7339532f829e814e2d2c SHA512 c6da4b4d4cbad3ad2b3a4c0208063e3858170356fc4f6670c95ce819f0aea69f103914875a12bf2715a869c2b19a3e79fcb55a695eb269d9937520db25da1e3d +DIST bcel-6.5.0-src.tar.gz 1009051 BLAKE2B fd07d8a5144112efe38e30a8d10c3b6a189a4ec70defa96c402fa88027acf84b07c15138d235354baac18bdb798d407c11ccfada7bbe7339532f829e814e2d2c SHA512 c6da4b4d4cbad3ad2b3a4c0208063e3858170356fc4f6670c95ce819f0aea69f103914875a12bf2715a869c2b19a3e79fcb55a695eb269d9937520db25da1e3d diff --git a/dev-java/bcel/bcel-6.5.0-r3.ebuild b/dev-java/bcel/bcel-6.5.0-r3.ebuild index 54af8629d599..4e54d469c6db 100644 --- a/dev-java/bcel/bcel-6.5.0-r3.ebuild +++ b/dev-java/bcel/bcel-6.5.0-r3.ebuild @@ -14,7 +14,8 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="Apache Commons Bytecode Engineering Library" HOMEPAGE="https://commons.apache.org/proper/commons-bcel/"; -SRC_URI="mirror://apache/commons/${PN}/source/${P}-src.tar.gz -> ${P}-sources.tar.gz" +SRC_URI="mirror://apache/commons/${PN}/source/${P}-src.tar.gz" + LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" @@ -33,9 +34,9 @@ DEPEND=" dev-java/commons-collections:4 dev-java/commons-io:1 dev-java/commons-lang:3.6 - dev-java/jna:4 - dev-java/jmh-core:0 dev-java/javax-mail:0 + dev-java/jmh-core:0 + dev-java/jna:4 ) " @@ -51,25 +52,34 @@ JAVA_SRC_DIR="src/main/java" JAVA_TEST_GENTOO_CLASSPATH="commons-collections-4,commons-io-1,commons-lang-3.6,jmh-core,jna-4,junit-4,javax-mail" JAVA_TEST_SRC_DIR="src/test/java" -JAVA_TEST_RESOURCE_DIRS=( - "src/test/resources" -) -JAVA_TEST_EXCLUDES=( - # Invalid test class - "org.apache.bcel.data.AnonymousClassTest" - "org.apache.bcel.verifier.tests.TestArray01" - "org.apache.bcel.verifier.tests.TestArrayAccess01" - "org.apache.bcel.verifier.tests.TestArrayAccess02Creator" - "org.apache.bcel.verifier.tests.TestArrayAccess03Creator" - "org.apache.bcel.verifier.tests.TestArrayAccess04Creator" - "org.apache.bcel.verifier.tests.TestLegalInvokeInterface01" - "org.apache.bcel.verifier.tests.TestLegalInvokeSpecial01" - "org.apache.bcel.verifier.tests.TestLegalInvokeSpecial02" - "org.apache.bcel.verifier.tests.TestLegalInvokeStatic01" - "org.apache.bcel.verifier.tests.TestLegalInvokeVirtual01" - "org.apache.bcel.verifier.tests.TestLegalInvokeVirtual02" - "org.apache.bcel.verifier.tests.TestReturn01Creator" - "org.apache.bcel.verifier.tests.TestReturn02" - "org.apache.bcel.verifier.tests.TestCreator" - "org.apache.bcel.verifier.tests.TestReturn03Creator" -) +JAVA_TEST_RESOURCE_DIRS="src/test/resources" + +src_prepare() { + default + sed \ + -e '/public void/s:testB79:notTestB79:' \ + -e '/public void/s:testB295:notTestB295:' \ + -i src/test/java/org/apache/bcel/PLSETestCase.java || die + sed \ + -e '/public void/s:testLocalVariableCount:notTestLocalVariableCount:' \ + -e '/public void/s:testLocalVariableTableCount:notTestLocalVariableTableCount:' \ + -i src/test/java/org/apache/bcel/CounterVisitorTestCase.java || die + sed \ + -e '/import org.junit.Test/a import org.junit.Ignore;' \ + -e '/testRemoveLocalVariable()/i @Ignore' \ + -e '/testRemoveLocalVariables()/i @Ignore' \ + -e '/testInvalidNullMethodBody_MailDateFormat()/i @Ignore' \ + -i src/test/java/org/apache/bcel/generic/MethodGenTestCase.java || die +} + +src_test() { + pushd src/test/java || die + local JAVA_TEST_RUN_ONLY=$(find * \ + -wholename "**/*TestCase.java" \ + ! -name "Abstract*TestCase.java" \ + ) + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" + popd + java-pkg-simple_src_test +}
