diff options
| -rw-r--r-- | eclass/java-pkg-simple.eclass | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass index 14650ea7e8d3..555d956d93d8 100644 --- a/eclass/java-pkg-simple.eclass +++ b/eclass/java-pkg-simple.eclass @@ -555,21 +555,19 @@ java-pkg-simple_src_test() { if [[ -n ${JAVA_TEST_RUN_ONLY} ]]; then tests_to_run="${JAVA_TEST_RUN_ONLY[@]}" else - pushd "${JAVA_TEST_SRC_DIR}" > /dev/null || die - tests_to_run=$(find * -type f\ - \( -name "*Test.java"\ - -o -name "Test*.java"\ - -o -name "*Tests.java"\ - -o -name "*TestCase.java" \)\ - ! -name "*Abstract*"\ - ! -name "*BaseTest*"\ - ! -name "*TestTypes*"\ - ! -name "*TestUtils*"\ - ! -name "*\$*") - tests_to_run=${tests_to_run//"${classes}"\/} - tests_to_run=${tests_to_run//.java} - tests_to_run=${tests_to_run//\//.} - popd > /dev/null || die + tests_to_run=$(find "${classes}" -type f\ + \( -name "*Test.class"\ + -o -name "Test*.class"\ + -o -name "*Tests.class"\ + -o -name "*TestCase.class" \)\ + ! -name "*Abstract*"\ + ! -name "*BaseTest*"\ + ! -name "*TestTypes*"\ + ! -name "*TestUtils*"\ + ! -name "*\$*") + tests_to_run=${tests_to_run//"${classes}"\/} + tests_to_run=${tests_to_run//.class} + tests_to_run=${tests_to_run//\//.} # exclude extra test classes, usually corner cases # that the code above cannot handle |