From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9158D158089 for ; Wed, 27 Sep 2023 06:58:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C5ECB2BC01E; Wed, 27 Sep 2023 06:58:03 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A8C302BC01E for ; Wed, 27 Sep 2023 06:58:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B3466335CDF for ; Wed, 27 Sep 2023 06:58:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0758B123E for ; Wed, 27 Sep 2023 06:58:01 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1695797871.0733594d8ff5e3fdd2b7617c36fdd2c761c66666.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/java-pkg-simple.eclass X-VCS-Directories: eclass/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 0733594d8ff5e3fdd2b7617c36fdd2c761c66666 X-VCS-Branch: master Date: Wed, 27 Sep 2023 06:58:01 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3abe089b-60b1-46f3-bddb-1feed9e6ba29 X-Archives-Hash: 25db227d30b5060b9de02d083b160fbf commit: 0733594d8ff5e3fdd2b7617c36fdd2c761c66666 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Sun May 14 07:39:19 2023 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Wed Sep 27 06:57:51 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0733594d Revert "java-pkg-simple.eclass: improve test selection for multi-jar packages" This reverts commit 3eb0cfe339e79270446731b8f27bdc1b060d023b. Closes: https://bugs.gentoo.org/906311 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Signed-off-by: Miroslav Šulc gentoo.org> eclass/java-pkg-simple.eclass | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass index 14650ea7e8d3..555d956d93d8 100644 --- a/eclass/java-pkg-simple.eclass +++ b/eclass/java-pkg-simple.eclass @@ -555,21 +555,19 @@ java-pkg-simple_src_test() { if [[ -n ${JAVA_TEST_RUN_ONLY} ]]; then tests_to_run="${JAVA_TEST_RUN_ONLY[@]}" else - pushd "${JAVA_TEST_SRC_DIR}" > /dev/null || die - tests_to_run=$(find * -type f\ - \( -name "*Test.java"\ - -o -name "Test*.java"\ - -o -name "*Tests.java"\ - -o -name "*TestCase.java" \)\ - ! -name "*Abstract*"\ - ! -name "*BaseTest*"\ - ! -name "*TestTypes*"\ - ! -name "*TestUtils*"\ - ! -name "*\$*") - tests_to_run=${tests_to_run//"${classes}"\/} - tests_to_run=${tests_to_run//.java} - tests_to_run=${tests_to_run//\//.} - popd > /dev/null || die + tests_to_run=$(find "${classes}" -type f\ + \( -name "*Test.class"\ + -o -name "Test*.class"\ + -o -name "*Tests.class"\ + -o -name "*TestCase.class" \)\ + ! -name "*Abstract*"\ + ! -name "*BaseTest*"\ + ! -name "*TestTypes*"\ + ! -name "*TestUtils*"\ + ! -name "*\$*") + tests_to_run=${tests_to_run//"${classes}"\/} + tests_to_run=${tests_to_run//.class} + tests_to_run=${tests_to_run//\//.} # exclude extra test classes, usually corner cases # that the code above cannot handle