diff options
| author |   Volkmar W. Pogatzki <gentoo@pogatzki.net> | 2023-05-14 09:39:19 +0200 |
|---|---|---|
| committer |   Miroslav Šulc <fordfrog@gentoo.org> | 2023-09-27 08:57:51 +0200 |
| commit | 0733594d8ff5e3fdd2b7617c36fdd2c761c66666 (patch) | |
| tree | b64d1f6eeb4a895865ac5ec03876f722a5df505f /eclass/java-pkg-simple.eclass | |
| parent | dev-python/cffi: add github upstream metadata (diff) | |
| download | gentoo-0733594d8ff5e3fdd2b7617c36fdd2c761c66666.tar.gz gentoo-0733594d8ff5e3fdd2b7617c36fdd2c761c66666.tar.bz2 gentoo-0733594d8ff5e3fdd2b7617c36fdd2c761c66666.zip | |
Revert "java-pkg-simple.eclass: improve test selection for multi-jar packages"
This reverts commit 3eb0cfe339e79270446731b8f27bdc1b060d023b.
Closes: https://bugs.gentoo.org/906311
Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
Diffstat (limited to 'eclass/java-pkg-simple.eclass')
| -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 |