From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3D4AE15800A for ; Tue, 15 Aug 2023 08:36:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 467B72BC02E; Tue, 15 Aug 2023 08:36:36 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2BF782BC02E for ; Tue, 15 Aug 2023 08:36:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 46B73335D8A for ; Tue, 15 Aug 2023 08:36:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 772F3EBF for ; Tue, 15 Aug 2023 08:36:33 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1692088156.86a3d726ee0e83fd0148fe719287cd7ad5d5b9ec.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/tomcat-native/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/tomcat-native/tomcat-native-1.2.38.ebuild X-VCS-Directories: dev-java/tomcat-native/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 86a3d726ee0e83fd0148fe719287cd7ad5d5b9ec X-VCS-Branch: master Date: Tue, 15 Aug 2023 08:36:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2ca64292-2d99-4811-bf14-d57a2771405a X-Archives-Hash: a35be328c4aade89a813f3ee5d355ee0 commit: 86a3d726ee0e83fd0148fe719287cd7ad5d5b9ec Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Mon Aug 14 06:23:49 2023 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Tue Aug 15 08:29:16 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86a3d726 dev-java/tomcat-native: enable a previously skipped test Also drops the erroneously added patch. Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Signed-off-by: Miroslav Šulc gentoo.org> dev-java/tomcat-native/tomcat-native-1.2.38.ebuild | 27 ++++------------------ 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/dev-java/tomcat-native/tomcat-native-1.2.38.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.38.ebuild index ad19397c09bf..ffaded131e6c 100644 --- a/dev-java/tomcat-native/tomcat-native-1.2.38.ebuild +++ b/dev-java/tomcat-native/tomcat-native-1.2.38.ebuild @@ -37,10 +37,6 @@ JAVA_SRC_DIR="../java" JAVA_TEST_GENTOO_CLASSPATH="junit-4" JAVA_TEST_SRC_DIR="../test" -PATCHES=( - "${FILESDIR}"/tomcat-native-2.0.3-slibtool.patch #778914 -) - DOCS=( ../{CHANGELOG.txt,NOTICE,README.txt} ) src_prepare() { @@ -50,22 +46,6 @@ src_prepare() { ../build.xml \ | sed "s:\${version}:${PV}:" \ > "${JAVA_RESOURCE_DIRS}/META-INF/MANIFEST.MF" || die - default - - # Needed for the slibtool patch - sed -i 's/configure.in/configure.ac/' configure.in || die - eautoreconf - - # There was 1 failure: - # 1) testInfoGet(org.apache.tomcat.jni.TestFile) - # java.lang.AssertionError: File test/org/apache/tomcat/jni/TestFile.java does not exist! - # at org.junit.Assert.fail(Assert.java:89) - # at org.junit.Assert.assertTrue(Assert.java:42) - # at org.apache.tomcat.jni.TestFile.testInfoGet(TestFile.java:29) - # - # FAILURES!!! - # Tests run: 1, Failures: 1 - rm ../test/org/apache/tomcat/jni/TestFile.java || die } src_configure() { @@ -82,9 +62,12 @@ src_compile() { } src_test() { + # Adjusting "String testFile =" path in TestFile.java:29 to match ${S} + sed \ + -e '/String testFile =/s&test/&../test/&' \ + -i ../test/org/apache/tomcat/jni/TestFile.java || die + JAVA_TEST_EXTRA_ARGS=( -Djava.library.path=".libs" ) -# jar cf test.jar ../test/org/apache/tomcat/jni/TestFile.java || die -# JAVA_GENTOO_CLASSPATH_EXTRA="test.jar" java-pkg-simple_src_test }