summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolkmar W. Pogatzki <gentoo@pogatzki.net>2023-03-01 20:52:59 +0100
committerMiroslav Šulc <fordfrog@gentoo.org>2023-10-18 09:46:32 +0200
commit9ad2683b86538e21a2d7411fa71058ac534c23de (patch)
tree42ccb6a7641a9c17932ac20fdf41ee3b38694022
parentjava-pkg-simple.eclass: avoid reverse dependency for dev-java/testng (diff)
downloadgentoo-9ad2683b86538e21a2d7411fa71058ac534c23de.tar.gz
gentoo-9ad2683b86538e21a2d7411fa71058ac534c23de.tar.bz2
gentoo-9ad2683b86538e21a2d7411fa71058ac534c23de.zip
java-utils-2.eclass: avoid reverse dependency for dev-java/testng
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 <gentoo@pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/29733 Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
-rw-r--r--eclass/java-utils-2.eclass6
1 files changed, 5 insertions, 1 deletions
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