commit: 304fbed07ba15ee1fe1fd67309d438bcbd66e315 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Fri Feb 9 21:47:23 2024 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Sat Feb 10 11:31:11 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=304fbed0
dev-java/jctools-core: add 4.0.3 changes TEST_TIMEOUT from 30000 to 60000 ms and drops older test exclusion for bug #863977. Bug: https://bugs.gentoo.org/924135 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/35251 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> dev-java/jctools-core/Manifest | 1 + .../jctools-core-4.0.3-increase-TEST_TIMEOUT.patch | 13 ++++ dev-java/jctools-core/jctools-core-4.0.3.ebuild | 70 ++++++++++++++++++++++ 3 files changed, 84 insertions(+) diff --git a/dev-java/jctools-core/Manifest b/dev-java/jctools-core/Manifest index e17ea6dfaa1c..8ac9a9cdd6db 100644 --- a/dev-java/jctools-core/Manifest +++ b/dev-java/jctools-core/Manifest @@ -1 +1,2 @@ DIST jctools-4.0.2.tar.gz 4237275 BLAKE2B 9bac4f8442f7a64aac47208ecf98799506244783d71a5444b6a3ff74ddca4e16232cf19dd5e7a9243dfcc3510674717982ef915759c8b6b2de74d4711d996302 SHA512 d19237929ab18360427efdf2844adc08589fc8ba2838b1f983118e1d6f1270bacad34477cb000e6bc85aeab38e7e337c397181b4351681f18977547c5b2e8f37 +DIST jctools-4.0.3.tar.gz 4237279 BLAKE2B be74c2b0997ec68b90249c8d2b841737fffa4e09724a25b5f5e15b8c4bbf811215023358bc674ed20f81d06a10db3ac2428b29d159ac99ef6dff7e6c36bf7fe2 SHA512 3d7cede6beba54871365cc2f49dc30f014a6f36a5e1f66e9cebd523d202806d49f24c23dbfd6bef0c25cbea0ca230b5d1afefd2b83b0150d335e8e99b6cec90f diff --git a/dev-java/jctools-core/files/jctools-core-4.0.3-increase-TEST_TIMEOUT.patch b/dev-java/jctools-core/files/jctools-core-4.0.3-increase-TEST_TIMEOUT.patch new file mode 100644 index 000000000000..6eccce942b62 --- /dev/null +++ b/dev-java/jctools-core/files/jctools-core-4.0.3-increase-TEST_TIMEOUT.patch @@ -0,0 +1,13 @@ +https://bugs.gentoo.org/863977 +https://bugs.gentoo.org/924135 +--- a/src/test/java/org/jctools/util/TestUtil.java ++++ b/src/test/java/org/jctools/util/TestUtil.java +@@ -19,7 +19,7 @@ import static org.jctools.util.UnpaddedQueueFactory.newUnpaddedQueue; + public class TestUtil { + public static final int CONCURRENT_TEST_DURATION = Integer.getInteger("org.jctools.concTestDurationMs", 500); + public static final int CONCURRENT_TEST_THREADS = Integer.getInteger("org.jctools.concTestThreads", Math.min(4, Runtime.getRuntime().availableProcessors())); +- public static final int TEST_TIMEOUT = 30000; ++ public static final int TEST_TIMEOUT = 60000; + private static final AtomicInteger threadIndex = new AtomicInteger(); + public static void sleepQuietly(long timeMs) { + LockSupport.parkNanos(TimeUnit.MILLISECONDS.toNanos(timeMs)); diff --git a/dev-java/jctools-core/jctools-core-4.0.3.ebuild b/dev-java/jctools-core/jctools-core-4.0.3.ebuild new file mode 100644 index 000000000000..bd095315bc5c --- /dev/null +++ b/dev-java/jctools-core/jctools-core-4.0.3.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="org.jctools:jctools-core:${PV}" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Java Concurrency Tools Core Library" +HOMEPAGE="https://jctools.github.io/JCTools/"; +SRC_URI="https://github.com/JCTools/JCTools/archive/v${PV}.tar.gz -> jctools-${PV}.tar.gz" +S="${WORKDIR}/JCTools-${PV}/jctools-core" + +LICENSE="Apache-2.0" +SLOT="3" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + +DEPEND=" + dev-java/osgi-annotation:0 + >=virtual/jdk-1.8:* + test? ( + dev-java/guava-testlib:0 + dev-java/hamcrest:0 + )" + +RDEPEND=">=virtual/jre-1.8:*" + +DOCS=( ../{README,RELEASE-NOTES}.md ) +PATCHES=( "${FILESDIR}/jctools-core-4.0.3-increase-TEST_TIMEOUT.patch" ) + +JAVA_AUTOMATIC_MODULE_NAME="org.jctools.core" +JAVA_CLASSPATH_EXTRA="osgi-annotation" +JAVA_SRC_DIR="src/main/java" + +JAVA_TEST_GENTOO_CLASSPATH="guava-testlib,hamcrest,junit-4" +JAVA_TEST_SRC_DIR="src/test/java" + +src_prepare() { + default #780585 + java-pkg-2_src_prepare +} + +# Using the defaults of java-pkg-simple would skip more than half the number of tests. +src_test() { + # org.jetbrains.kotlinx.lincheck is not yet packaged + rm -r src/test/java/org/jctools/maps/linearizability_test || die + # These tests would fail and are not run by "mvn test". + # "org.jctools.queues.MpqSanityTest" + # "org.jctools.queues.QueueSanityTest" + # "org.jctools.queues.ScQueueRemoveTest" + # "org.jctools.util.TestUtil" + pushd src/test/java || die + local JAVA_TEST_RUN_ONLY=$(find * \ + \( -name "*Test*.java" \ + -o -name "nbsi_tester.java" \ + -o -name "nbhs_tester.java" \)\ + ! -name "MpqSanityTest.java" \ + ! -name "QueueSanityTest.java" \ + ! -name "ScQueueRemoveTest.java" \ + ! -name "TestUtil.java" \ + ) + popd + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" + java-pkg-simple_src_test + # OK (8746 tests) +}
