diff options
| author |   Volkmar W. Pogatzki <gentoo@pogatzki.net> | 2023-08-14 08:23:49 +0200 |
|---|---|---|
| committer |   Miroslav Šulc <fordfrog@gentoo.org> | 2023-08-15 10:29:16 +0200 |
| commit | 86a3d726ee0e83fd0148fe719287cd7ad5d5b9ec (patch) | |
| tree | ec4282428adb2cef81e840a8c6fdd1f8b1d740e3 /dev-java | |
| parent | www-client/chromium: beta channel bump to 116.0.5845.96 (diff) | |
| download | gentoo-86a3d726ee0e83fd0148fe719287cd7ad5d5b9ec.tar.gz gentoo-86a3d726ee0e83fd0148fe719287cd7ad5d5b9ec.tar.bz2 gentoo-86a3d726ee0e83fd0148fe719287cd7ad5d5b9ec.zip | |
dev-java/tomcat-native: enable a previously skipped test
Also drops the erroneously added patch.
Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/tomcat-native/tomcat-native-1.2.38.ebuild | 27 |
1 files 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 } |