commit: dab318c383567c82677d3edeb6efd34f07d60cc2 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Fri Mar 25 14:25:39 2022 +0000 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> CommitDate: Sat Mar 26 12:20:53 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dab318c3
dev-java/snakeyaml: Add snakeyaml-1.30-fix-test-check.patch Bug: https://bugs.gentoo.org/835988 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/24745 Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> .../files/snakeyaml-1.30-fix-test-check.patch | 18 ++++++++++++++++++ dev-java/snakeyaml/snakeyaml-1.30.ebuild | 7 +++++++ 2 files changed, 25 insertions(+) diff --git a/dev-java/snakeyaml/files/snakeyaml-1.30-fix-test-check.patch b/dev-java/snakeyaml/files/snakeyaml-1.30-fix-test-check.patch new file mode 100644 index 000000000000..f2742f658fa2 --- /dev/null +++ b/dev-java/snakeyaml/files/snakeyaml-1.30-fix-test-check.patch @@ -0,0 +1,18 @@ +--- a/src/test/java/org/yaml/snakeyaml/issues/issue377/BillionLaughsAttackTest.java ++++ b/src/test/java/org/yaml/snakeyaml/issues/issue377/BillionLaughsAttackTest.java +@@ -69,7 +69,7 @@ public class BillionLaughsAttackTest { + map.toString(); + fail("Expected overflow"); + } catch (Throwable e) { +- assertTrue(e.getMessage().contains("heap")); ++ assertTrue("Catched exception " + e + " is not an instance of OutOfMemoryError", e instanceof OutOfMemoryError); + } + } + +@@ -94,4 +94,4 @@ public class BillionLaughsAttackTest { + assertNotNull(map); + } + +-} +\ No newline at end of file ++} diff --git a/dev-java/snakeyaml/snakeyaml-1.30.ebuild b/dev-java/snakeyaml/snakeyaml-1.30.ebuild index 97e755428cc8..6ae8d5e2d63e 100644 --- a/dev-java/snakeyaml/snakeyaml-1.30.ebuild +++ b/dev-java/snakeyaml/snakeyaml-1.30.ebuild @@ -38,6 +38,8 @@ RDEPEND=" >=virtual/jre-1.8:* " +# https://bitbucket.org/snakeyaml/snakeyaml/pull-requests/7 +PATCHES=( "${FILESDIR}/snakeyaml-1.30-fix-test-check.patch" ) DOCS=( README.md ) S="${WORKDIR}/snakeyaml-snakeyaml-49227c24d741/" @@ -48,6 +50,11 @@ JAVA_TEST_GENTOO_CLASSPATH="joda-time,junit-4,velocity" JAVA_TEST_SRC_DIR="src/test/java" JAVA_TEST_RESOURCE_DIRS="src/test/resources" +src_prepare() { + default + java-utils-2_src_prepare +} + src_test() { export EnvironmentKey1="EnvironmentValue1" export EnvironmentEmpty=""
