From 0912295778c330339aa22de4e7635d3f26b983d4 Mon Sep 17 00:00:00 2001 From: "Volkmar W. Pogatzki" Date: Wed, 18 Oct 2023 11:37:15 +0200 Subject: [PATCH 1/2] java-pkg-simple.eclass: improve description of "generated-test" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Volkmar W. Pogatzki Closes: https://github.com/gentoo/gentoo/pull/33389 Signed-off-by: Miroslav Šulc --- eclass/java-pkg-simple.eclass | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass index ea4833727ea17..d37ea93e0269b 100644 --- a/eclass/java-pkg-simple.eclass +++ b/eclass/java-pkg-simple.eclass @@ -485,8 +485,10 @@ java-pkg-simple_src_install() { # @FUNCTION: java-pkg-simple_src_test # @DESCRIPTION: # src_test for simple single java jar file. -# It will perform test with frameworks that are defined in -# ${JAVA_TESTING_FRAMEWORKS}. +# It will compile test classes from test sources using ejavac and perform tests +# with frameworks that are defined in ${JAVA_TESTING_FRAMEWORKS}. +# test-classes compiled with alternative compilers like groovyc need to be placed +# in the "generated-test" directory. java-pkg-simple_src_test() { local test_sources=test_sources.lst classes=target/test-classes moduleinfo local tests_to_run classpath @@ -502,12 +504,13 @@ java-pkg-simple_src_test() { fi # https://bugs.gentoo.org/906311 + # This will remove target/test-classes. Do not put any test-classes there manually. rm -rf ${classes} || die # 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 + # generated test classes should get compiled into "generated-test" directory if [[ -d generated-test ]]; then cp -r generated-test/* "${classes}" || die "cannot copy generated test classes" fi From 79bda3c19d4c3dfd16891f93dcce917df5a2a52d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ulc?= Date: Thu, 19 Oct 2023 20:22:45 +0200 Subject: [PATCH 2/2] java-pkg-simple.eclass: improved description MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miroslav Šulc --- eclass/java-pkg-simple.eclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass index d37ea93e0269b..143efa7077510 100644 --- a/eclass/java-pkg-simple.eclass +++ b/eclass/java-pkg-simple.eclass @@ -488,7 +488,8 @@ java-pkg-simple_src_install() { # It will compile test classes from test sources using ejavac and perform tests # with frameworks that are defined in ${JAVA_TESTING_FRAMEWORKS}. # test-classes compiled with alternative compilers like groovyc need to be placed -# in the "generated-test" directory. +# in the "generated-test" directory as content of this directory is preserved, +# whereas content of target/test-classes is removed. java-pkg-simple_src_test() { local test_sources=test_sources.lst classes=target/test-classes moduleinfo local tests_to_run classpath