diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-test.xml | 7 | ||||
| -rw-r--r-- | make/scripts/tests.sh | 3 |
2 files changed, 9 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"/> --> diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index 714a79776..41748eebd 100644 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -375,6 +375,9 @@ function jrun() { export USE_CLASSPATH=$JOGAMP_ALL_AWT_CLASSPATH echo USE_CLASSPATH $USE_CLASSPATH X_ARGS="-Djava.awt.headless=true $X_ARGS" + if [ $MOSX -eq 1 ] ; then + X_ARGS="-XstartOnFirstThread $X_ARGS" + fi elif [ $awton -eq -1 ] ; then export USE_CLASSPATH=$JOGAMP_ATOMICS_NOAWT_CLASSPATH else |