[gentoo-commits] repo/gentoo:master commit in: eclass/

[Miroslav Šulc]

commit:     3ac5e8eef28744ef11948894c1f7cf64586f36d7
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  3 06:21:16 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Jul  3 06:21:32 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ac5e8ee

java-utils-2.eclass: added support for parsing args to tests

Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 eclass/java-utils-2.eclass | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass
index 7b61c0b74cf..ed4951ac97b 100644
--- a/eclass/java-utils-2.eclass
+++ b/eclass/java-utils-2.eclass
@@ -125,6 +125,22 @@ JAVA_PKG_ALLOW_VM_CHANGE=${JAVA_PKG_ALLOW_VM_CHANGE:="yes"}
 #      JAVA_PKG_WANT_TARGET=1.3 emerge bar
 # @CODE
 
+# @ECLASS-VARIABLE: JAVA_TEST_EXTRA_ARGS
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Array of extra arguments that should be passed to java command when running 
tests.
+# It is useful when you need to pass a value to a Java program that uses
+# System.getProperty(). If it uses System.getenv(), use `export var=value` 
instead.
+#
+# It is used only when running tests.
+#
+# @CODE
+#      JAVA_TEST_EXTRA_ARGS=(
+#              -Dsome.var=x
+#              "-Dother.var=\"y z\""
+#      )
+# @CODE
+
 # @ECLASS-VARIABLE: JAVA_PKG_DEBUG
 # @DEFAULT_UNSET
 # @DESCRIPTION:
@@ -1797,8 +1813,8 @@ ejunit_() {
        if [[ "${junit}" == "junit-4" ]] ; then
                runner=org.junit.runner.JUnitCore
        fi
-       debug-print "Calling: java -cp \"${cp}\" -Djava.io.tmpdir=\"${T}\" 
-Djava.awt.headless=true ${runner} ${@}"
-       java -cp "${cp}" -Djava.io.tmpdir="${T}/" -Djava.awt.headless=true 
${runner} "${@}" || die "Running junit failed"
+       debug-print "Calling: java -cp \"${cp}\" -Djava.io.tmpdir=\"${T}\" 
-Djava.awt.headless=true ${JAVA_TEST_EXTRA_ARGS[@]} ${runner} ${@}"
+       java -cp "${cp}" -Djava.io.tmpdir="${T}/" -Djava.awt.headless=true 
${JAVA_TEST_EXTRA_ARGS[@]} ${runner} "${@}" || die "Running junit failed"
 }
 
 # @FUNCTION: ejunit
@@ -1877,9 +1893,9 @@ etestng() {
        done
 
        debug-print "java -cp \"${cp}\" -Djava.io.tmpdir=\"${T}\""\
-               "-Djava.awt.headless=true ${runner}"\
+               "-Djava.awt.headless=true ${JAVA_TEST_EXTRA_ARGS[@]} ${runner}"\
                "-usedefaultlisteners false -testclass ${tests}"
-       java -cp "${cp}" -Djava.io.tmpdir=\"${T}\" -Djava.awt.headless=true\
+       java -cp "${cp}" -Djava.io.tmpdir=\"${T}\" -Djava.awt.headless=true 
${JAVA_TEST_EXTRA_ARGS[@]}\
                ${runner} -usedefaultlisteners false -testclass ${tests}\
                || die "Running TestNG failed."
 }