This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/9.0.x by this push:
     new 9c2066f54d Support running FFM tests with OpenSSL on MacOS
9c2066f54d is described below

commit 9c2066f54da99736b564d36c742642d2d771a569
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 28f85001f7..179eb8083c 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -83,6 +83,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 9797143cfb..5ad2d2aaa1 100644
--- a/build.xml
+++ b/build.xml
@@ -2066,6 +2066,9 @@
           <jvmarg value="${opens.sunrmi}"/>
           <jvmarg value="${opens.javautil}"/>
           <jvmarg value="${opens.javautilconcurrent}"/>
+          <!-- 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

Reply via email to