diff options
Diffstat (limited to 'eclass/java-pkg-simple.eclass')
-rw-r--r-- | eclass/java-pkg-simple.eclass | 8 |
1 files changed, 7 insertions, 1 deletions
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 |