diff options
| author | Sven Gothel <[email protected]> | 2023-01-17 23:37:29 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2023-01-17 23:37:29 +0100 |
| commit | c33ea9f33dd0f074464ee119e0c631b091fdeb1a (patch) | |
| tree | 43ce3aa29dbe76bc06b61369b130888dde4e3761 /make/build-test.xml | |
| parent | 1695e5b63b259647dc90947e69822555a3c5408c (diff) | |
build-test: Add jvmarg.modules for jvm [11..17) and jvm>=17
jvm11: --illegal-access=warn
jvm17: --add-opens java.desktop/sun.awt=ALL-UNNAMED --add-opens java.desktop/sun.java2d=ALL-UNNAMED
Diffstat (limited to 'make/build-test.xml')
| -rw-r--r-- | make/build-test.xml | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/make/build-test.xml b/make/build-test.xml index 2b6a66862..9044d5887 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -38,12 +38,33 @@ <property name="test.archive.name" value="${archive.name}-test-results-${build.node.name}"/> + <!-- not required: java.base/java.lang=ALL-UNNAMED --> + <!-- required for AWT: java.desktop/sun.awt=ALL-UNNAMED java.desktop/sun.java2d=ALL-UNNAMED --> + <condition property="jvmarg.modules" value="--add-opens java.desktop/sun.awt=ALL-UNNAMED --add-opens java.desktop/sun.java2d=ALL-UNNAMED"> + <isset property="minJava17"/> + </condition> + <condition property="jvmarg.modules" value="--illegal-access=warn"> + <and> + <isset property="minJava11"/> + <not> + <isset property="minJava17"/> + </not> + </and> + </condition> + <property name="jvmarg.modules" value=""/> <!-- default is empty --> + <property name="jvmarg.generic" value="${jvmarg.modules}"/> + <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"/> + <echo message="jvmarg.modules ${jvmarg.modules}"/> + <echo message="jvmarg.generic ${jvmarg.generic}"/> + <echo message="jvmarg.headless ${jvmarg.headless}"/> + <echo message="jvmarg.swt.headless ${jvmarg.swt.headless}"/> + <property name="batchtest.timeout" value="1800000"/> <!-- 30 min --> </target> @@ -298,6 +319,7 @@ <arg line="${junit.run.arg1}"/> <arg line="${jvmDataModel.arg}"/> <arg value="-Djava.library.path=${obj.all.paths}"/> + <arg line="${jvmarg.generic}"/> <!-- <arg line="-Dnewt.debug.EDT"/> --> @@ -323,6 +345,7 @@ <jvmarg value="${junit.run.arg1}"/> <jvmarg value="${jvmDataModel.arg}"/> <jvmarg value="-Djava.library.path=${obj.all.paths}"/> + <jvmarg line="${jvmarg.generic}"/> <!-- <jvmarg value="-Djogl.debug=all"/> @@ -397,6 +420,7 @@ <arg line="${junit.run.arg1}"/> <arg line="${jvmDataModel.arg}"/> <arg value="-Djava.library.path=${obj.all.paths}"/> + <arg line="${jvmarg.generic}"/> <arg line="${jvmarg.headless}"/> <!-- <arg line="-Dnewt.debug.EDT"/> @@ -444,6 +468,7 @@ <jvmarg value="${junit.run.arg1}"/> <jvmarg value="${jvmDataModel.arg}"/> <jvmarg value="-Djava.library.path=${obj.all.paths}"/> + <jvmarg line="${jvmarg.generic}"/> <!-- <jvmarg value="-Dnewt.debug.EDT"/> @@ -489,6 +514,7 @@ <jvmarg value="${junit.run.arg1}"/> <jvmarg value="${jvmDataModel.arg}"/> <jvmarg value="-Djava.library.path=${obj.all.paths}"/> + <jvmarg line="${jvmarg.generic}"/> <!-- <jvmarg value="-Djogl.debug=all"/> @@ -539,6 +565,7 @@ <jvmarg value="${junit.run.arg1}"/> <jvmarg value="${jvmDataModel.arg}"/> <jvmarg value="-Djava.library.path=${obj.all.paths}"/> + <jvmarg line="${jvmarg.generic}"/> <!-- <jvmarg value="-Dnewt.debug.EDT"/> @@ -631,6 +658,7 @@ <jvmarg value="${junit.run.arg1}"/> <jvmarg value="${jvmDataModel.arg}"/> <jvmarg value="-Djava.library.path=${obj.all.paths}"/> + <jvmarg line="${jvmarg.generic}"/> <!-- <jvmarg value="-Djogl.debug=all"/> @@ -673,6 +701,7 @@ <arg line="${junit.run.arg1}"/> <arg line="${jvmDataModel.arg}"/> <arg value="-Djava.library.path=${obj.all.paths}"/> + <arg line="${jvmarg.generic}"/> <arg line="${jvmarg.headless}"/> <!-- <arg line="-Dnewt.debug.EDT"/> @@ -740,6 +769,7 @@ <arg line="${junit.run.arg1}"/> <arg line="${jvmDataModel.arg}"/> <arg value="-Djava.library.path=${obj.all.paths}"/> + <arg line="${jvmarg.generic}"/> <arg line="${jvmarg.swt.headless}"/> <!-- <arg line="-Dnewt.debug.EDT"/> |