From 9ad2683b86538e21a2d7411fa71058ac534c23de Mon Sep 17 00:00:00 2001 From: "Volkmar W. Pogatzki" Date: Wed, 1 Mar 2023 20:52:59 +0100 Subject: java-utils-2.eclass: avoid reverse dependency for dev-java/testng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This change depends on the correlating change on the java-pkg-simple.eclass. For testing dev-java/testng before having it installed it is not possible to use java-pkg_getjars. This change adds a condition so that this case uses the freshly compiled testng.jar. Signed-off-by: Volkmar W. Pogatzki Closes: https://github.com/gentoo/gentoo/pull/29733 Signed-off-by: Miroslav Šulc --- eclass/java-utils-2.eclass | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index 1efb655acf71..fd1f708b86b4 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -1892,7 +1892,11 @@ etestng() { debug-print-function ${FUNCNAME} $* local runner=org.testng.TestNG - local cp=$(java-pkg_getjars --with-dependencies testng) + if [[ ${PN} != testng ]]; then + local cp=$(java-pkg_getjars --with-dependencies testng) + else + local cp=testng.jar + fi local tests if [[ ${1} = -cp || ${1} = -classpath ]]; then -- cgit v1.2.3-65-gdbad