| 1 |
commit: 0a265ada45d01cf883d55e3367472db981940aef |
| 2 |
Author: Yuan Liao <liaoyuan <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Wed Apr 6 17:27:52 2022 +0000 |
| 4 |
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu May 12 07:02:17 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a265ada |
| 7 |
|
| 8 |
dev-java/jna: Use JUnit 4 to run tests for 5.10.0 |
| 9 |
|
| 10 |
The test classes excluded by 5.10.0-tests-exclude.patch actually have |
| 11 |
some JUnit 4 tests, whereas the rest of the test suite contains JUnit 3 |
| 12 |
tests. JUnit 4 can be used to run both types of tests, but JUnit 3 |
| 13 |
cannot run JUnit 4 tests, which is why the patch was needed. By |
| 14 |
switching to JUnit 4, test coverage increases, and the patch can also be |
| 15 |
dropped. |
| 16 |
|
| 17 |
Signed-off-by: Yuan Liao <liaoyuan <AT> gmail.com> |
| 18 |
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> |
| 19 |
|
| 20 |
dev-java/jna/files/5.10.0-tests-exclude.patch | 27 --------------------------- |
| 21 |
dev-java/jna/jna-5.10.0.ebuild | 3 +-- |
| 22 |
2 files changed, 1 insertion(+), 29 deletions(-) |
| 23 |
|
| 24 |
diff --git a/dev-java/jna/files/5.10.0-tests-exclude.patch b/dev-java/jna/files/5.10.0-tests-exclude.patch |
| 25 |
deleted file mode 100644 |
| 26 |
index e608e2087f44..000000000000 |
| 27 |
--- a/dev-java/jna/files/5.10.0-tests-exclude.patch |
| 28 |
+++ /dev/null |
| 29 |
@@ -1,27 +0,0 @@ |
| 30 |
-From 2b50e2296c9c9961fd168abe285f773aecd6437a Mon Sep 17 00:00:00 2001 |
| 31 |
-From: Yuan Liao <liaoyuan@×××××.com> |
| 32 |
-Date: Thu, 6 Jan 2022 12:21:22 -0800 |
| 33 |
-Subject: [PATCH] Skip execution of test classes without any tests |
| 34 |
- |
| 35 |
-Signed-off-by: Yuan Liao <liaoyuan@×××××.com> |
| 36 |
---- |
| 37 |
- build.xml | 3 +++ |
| 38 |
- 1 file changed, 3 insertions(+) |
| 39 |
- |
| 40 |
-diff --git a/build.xml b/build.xml |
| 41 |
-index ed104c2..9fb15ae 100644 |
| 42 |
---- a/build.xml |
| 43 |
-+++ b/build.xml |
| 44 |
-@@ -1388,6 +1388,9 @@ cd .. |
| 45 |
- <fileset dir="${test.src}" excludes="${tests.exclude-patterns}"> |
| 46 |
- <patternset includes="${tests.include}"/> |
| 47 |
- <include name="${tests.platform}"/> |
| 48 |
-+ <exclude name="com/sun/jna/DefaultMethodInvocationTest.java"/> |
| 49 |
-+ <exclude name="com/sun/jna/ELFAnalyserTest.java"/> |
| 50 |
-+ <exclude name="com/sun/jna/PrematureGCTest.java"/> |
| 51 |
- <exclude name="${tests.exclude}"/> |
| 52 |
- </fileset> |
| 53 |
- </batchtest> |
| 54 |
--- |
| 55 |
-2.34.1 |
| 56 |
- |
| 57 |
|
| 58 |
diff --git a/dev-java/jna/jna-5.10.0.ebuild b/dev-java/jna/jna-5.10.0.ebuild |
| 59 |
index 80d0409f955c..1d15c940f056 100644 |
| 60 |
--- a/dev-java/jna/jna-5.10.0.ebuild |
| 61 |
+++ b/dev-java/jna/jna-5.10.0.ebuild |
| 62 |
@@ -30,7 +30,7 @@ DEPEND=" |
| 63 |
dev-java/ant-core:0 |
| 64 |
dev-java/asm:9 |
| 65 |
test? ( |
| 66 |
- dev-java/ant-junit:0 |
| 67 |
+ dev-java/ant-junit4:0 |
| 68 |
dev-java/junit:4 |
| 69 |
dev-java/reflections:0 |
| 70 |
) |
| 71 |
@@ -46,7 +46,6 @@ RDEPEND=" |
| 72 |
DOCS=( README.md CHANGES.md OTHERS TODO ) |
| 73 |
PATCHES=( |
| 74 |
"${FILESDIR}/${PV}-build.xml.patch" |
| 75 |
- "${FILESDIR}/${PV}-tests-exclude.patch" |
| 76 |
"${FILESDIR}/4.2.2-makefile-flags.patch" |
| 77 |
) |
Archives