summaryrefslogtreecommitdiffstats
path: root/make/build-test.xml
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2023-01-16 02:56:32 +0100
committerSven Gothel <[email protected]>2023-01-16 02:56:32 +0100
commit4b31fa321bdf02ce87648dcb7c0034b297a9e71f (patch)
tree26d835c59d2aaa1f97e6cd7019223bad8d458b18 /make/build-test.xml
parent654a3a9bb82c20b03a5286a7d9ac84c3a38923d4 (diff)
SWT tests on MacOS (w/o AWT) require '-XstartOnFirstThread' JVM argument, else they crash.
Diffstat (limited to 'make/build-test.xml')
-rw-r--r--make/build-test.xml7
1 files changed, 6 insertions, 1 deletions
diff --git a/make/build-test.xml b/make/build-test.xml
index f1fe937e3..2b6a66862 100644
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -37,8 +37,13 @@
<property name="java.dir.bugs" value="${java.dir.test}/bugs"/>
<property name="test.archive.name" value="${archive.name}-test-results-${build.node.name}"/>
+
<property name="jvmarg.headless" value="-Djava.awt.headless=true"/>
+ <!-- NOTE: the value of the jvmarg.swt.headless property will not be overridden if already set (by conditional isOSX) -->
+ <condition property="jvmarg.swt.headless" value="-XstartOnFirstThread -Djava.awt.headless=true"><isset property="isOSX"/></condition>
+ <property name="jvmarg.swt.headless" value="-Djava.awt.headless=true"/>
+
<property name="batchtest.timeout" value="1800000"/> <!-- 30 min -->
</target>
@@ -735,7 +740,7 @@
<arg line="${junit.run.arg1}"/>
<arg line="${jvmDataModel.arg}"/>
<arg value="-Djava.library.path=${obj.all.paths}"/>
- <arg line="${jvmarg.headless}"/>
+ <arg line="${jvmarg.swt.headless}"/>
<!--
<arg line="-Dnewt.debug.EDT"/>
-->