diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-10-18 10:02:49 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-10-18 10:02:49 +0100 |
| commit | 8aed242683822c23f5ed6a295d3464161e2d0880 (patch) | |
| tree | cb1e15198402ba7e5f401a02469a6e7219a2e9b3 /eclass | |
| parent | d0678ca0b0a7eefe3151a0b6c78f5ec2dd1c0ad8 (diff) | |
gentoo auto-resync : 18:10:2023 - 10:02:48
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 39144 -> 39147 bytes | |||
| -rw-r--r-- | eclass/java-pkg-simple.eclass | 8 | ||||
| -rw-r--r-- | eclass/java-utils-2.eclass | 15 | ||||
| -rw-r--r-- | eclass/qt5-build.eclass | 2 |
4 files changed, 20 insertions, 5 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex e781dc16fa78..8da163acc69c 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass index 02200f10cb8d..ea4833727ea1 100644 --- a/eclass/java-pkg-simple.eclass +++ b/eclass/java-pkg-simple.eclass @@ -46,7 +46,8 @@ if has test ${JAVA_PKG_IUSE}; then test_deps+=" amd64? ( dev-util/pkgdiff dev-util/japi-compliance-checker )";; testng) - test_deps+=" dev-java/testng:0";; + [[ ${PN} != testng ]] && \ + test_deps+=" dev-java/testng:0";; esac done [[ ${test_deps} ]] && DEPEND="test? ( ${test_deps} )" @@ -506,6 +507,11 @@ java-pkg-simple_src_test() { # 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 + if [[ -d generated-test ]]; then + cp -r generated-test/* "${classes}" || die "cannot copy generated test classes" + fi + # get classpath classpath="${classes}:${JAVA_JAR_FILENAME}" java-pkg-simple_getclasspath diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index 92e02e3085b1..fd1f708b86b4 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -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." diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index e9cb2f50fd3a..db333767fae6 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -233,7 +233,7 @@ qt5-build_src_configure() { # Workaround for bug #915203 # Upstream: https://bugreports.qt.io/browse/QTBUG-111514 - if [[ ${PN} != qtcore ]]; then + if [[ ${PN} != qtcore ]] && tc-ld-is-lld ; then append-ldflags -Wl,--undefined-version fi |