This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 69bb6ac2b1 Improve library path to do both
69bb6ac2b1 is described below
commit 69bb6ac2b192c66768340a57cc1c3e16bffa8b8a
Author: remm <[email protected]>
AuthorDate: Tue Oct 24 14:31:01 2023 +0200
Improve library path to do both
---
build.xml | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/build.xml b/build.xml
index 435fe88c9e..0e04b2c0f0 100644
--- a/build.xml
+++ b/build.xml
@@ -1971,11 +1971,6 @@
extension=".NIO2" />
</target>
- <target name="test-apr-exists" description="Checks for APR lib"
- if="${execute.test.apr}">
- <available file="${test.apr.loc}" property="apr.exists" />
- </target>
-
<target name="test-openssl-exists" description="Checks for the OpenSSL
binary">
<property environment="env" />
<condition property="test.openssl.exists">
@@ -1994,11 +1989,7 @@
<!-- Set native specific properties -->
<property name="native.nativeaccess"
value="--enable-native-access=ALL-UNNAMED"/>
- <condition property="runtests.librarypath" value="-Dtest.4=4">
- <!-- TODO: Find something better here, but the library path would conflict
between tomcat-native and OpenSSL FFM -->
- <javaversion atleast="${release.java.version}" />
- </condition>
- <property name="runtests.librarypath"
value="-Djava.library.path=${test.apr.loc}"/>
+ <property name="runtests.librarypath"
value="-Djava.library.path=${test.apr.loc}${path.separator}${java.library.path}"/>
<property name="opens.javalang"
value="--add-opens=java.base/java.lang=ALL-UNNAMED"/>
<property name="opens.javaio"
value="--add-opens=java.base/java.io=ALL-UNNAMED"/>
<property name="opens.sunrmi"
value="--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
