mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2026-05-04 19:56:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

eclass/java-utils-2: Sync with Gentoo

Browse Source 
It's from Gentoo commit 9ad2683b86538e21a2d7411fa71058ac534c23de.
This commit is contained in:
Flatcar Buildbot 2023-10-23 07:12:41 +00:00 committed by Krzesimir Nowak
parent e9c3a35574
commit f718f82938
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sdk_container/src/third_party/portage-stable/eclass/java-utils-2.eclass vendored
View File

@ -1886,13 +1886,17 @@ ejunit4() {
# @CODE
# $1 - -cp or -classpath
# $2 - the classpath passed to it
# $@ - test classes for testng to run.
# $@ - test classes or testng.xml for testng to run.
# @CODE
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
@ -1910,6 +1914,7 @@ etestng() {
-cp ${cp}
-Djava.io.tmpdir="${T}"
-Djava.awt.headless=true
-Dtest.resources.dir="${JAVA_TEST_RESOURCE_DIRS}"
${JAVA_TEST_EXTRA_ARGS[@]}
${runner}
${JAVA_TEST_RUNNER_EXTRA_ARGS[@]}
@ -1922,7 +1927,11 @@ etestng() {
)
fi
args+=( -testclass ${tests} )
if [[ "${test%.xml}" == "${test}" ]]; then
args+=( -testclass ${tests} )
else
args+=( ${tests%,} )
fi
debug-print "java ${args[@]}"
java ${args[@]} || die "Running TestNG failed."