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 DF521158089 for ; Wed, 18 Oct 2023 07:50:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 12BE72BC081; Wed, 18 Oct 2023 07:50:58 +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 EC2002BC07D for ; Wed, 18 Oct 2023 07:50:57 +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 F04A9335D27 for ; Wed, 18 Oct 2023 07:50:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 56561128C for ; Wed, 18 Oct 2023 07:50:55 +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: <1697615192.5f231202e9ad571835518f33075340ee2f60c7d8.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: 5f231202e9ad571835518f33075340ee2f60c7d8 X-VCS-Branch: master Date: Wed, 18 Oct 2023 07:50:55 +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: 880bec02-3048-434f-92c7-3a7e9911b3ce X-Archives-Hash: 769733d073bdf1cc5dd8c792bd685728 commit: 5f231202e9ad571835518f33075340ee2f60c7d8 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Mon Oct 9 17:57:42 2023 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Wed Oct 18 07:46:32 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f231202 java-pkg-simple.eclass: avoid removal of generated test classes Solution of bug #906311 removes all test classes at beginning of src_test() including test classes generated from the ebuild. With this commit generated test classes will be copied from the new generated-test directory into target/test-classes. Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Signed-off-by: Miroslav Šulc gentoo.org> eclass/java-pkg-simple.eclass | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass index 02200f10cb8d..98affc522295 100644 --- a/eclass/java-pkg-simple.eclass +++ b/eclass/java-pkg-simple.eclass @@ -506,6 +506,11 @@ java-pkg-simple_src_test() { # create the target directory mkdir -p ${classes} || die "Could not create target directory for testing" + # generated test classes should get generated into "generated-test" directory + if [[ -d generated-test ]]; then + cp -r generated-test/* "${classes}" || die "cannot copy generated test classes" + fi + # get classpath classpath="${classes}:${JAVA_JAR_FILENAME}" java-pkg-simple_getclasspath