This is an automated email from the ASF dual-hosted git repository.
markt 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 a10c7d650b Support running FFM tests with OpenSSL on MacOS
a10c7d650b is described below
commit a10c7d650b4ffce8f2e8e53251fe747bdaa4be71
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jul 30 19:13:10 2024 +0100
Support running FFM tests with OpenSSL on MacOS
---
build.properties.default | 7 +++++++
build.xml | 3 +++
2 files changed, 10 insertions(+)
diff --git a/build.properties.default b/build.properties.default
index cadabc1b03..a63921dbe4 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -81,6 +81,13 @@ test.threads=1
# multicast tests to work
java.net.preferIPv4Stack=false
+# MacOS requires non-default settings to test FFM with OpenSSL. Eg:
+#openssl.ffm.1=-Dorg.apache.tomcat.util.openssl.USE_SYSTEM_LOAD_LIBRARY=true
+#openssl.ffm.2=-Dorg.apache.tomcat.util.openssl.LIBRARY_NAME=ssl
+openssl.ffm.1=-DNoop1
+openssl.ffm.2=-DNoop2
+
+
# ----- Release build settings -----
# Location of GPG executable
gpg.exec=/path/to/gpg
diff --git a/build.xml b/build.xml
index c74cffd013..f4fcfa0089 100644
--- a/build.xml
+++ b/build.xml
@@ -2065,6 +2065,9 @@
<jvmarg value="${opens.javautil}"/>
<jvmarg value="${opens.javautilconcurrent}"/>
<jvmarg value="${native.nativeaccess}"/>
+ <!-- These are managed as jvmargs rather than sysproperty because
the default varies by OS -->
+ <jvmarg value="${openssl.ffm.1}" />
+ <jvmarg value="${openssl.ffm.2}" />
<classpath refid="tomcat.test.classpath" />
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
