diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-test.xml | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/make/build-test.xml b/make/build-test.xml index f011fdad5..feb9ae834 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -31,8 +31,6 @@ <condition property="jvmarg.mainthrd" value="-Ddummy"><not><isset property="isOSX"/></not></condition> <condition property="jvmarg.headless" value="-XstartOnFirstThread -Djava.awt.headless=true"><isset property="isOSX"/></condition> <condition property="jvmarg.headless" value="-Djava.awt.headless=true"><not><isset property="isOSX"/></not></condition> - <condition property="jvmarg.arch" value="-d64"><isset property="is64Bit"/></condition> - <condition property="jvmarg.arch" value="-d32"><not><isset property="is64Bit"/></not></condition> <property name="batchtest.timeout" value="1800000"/> <!-- 30 min --> </target> @@ -153,7 +151,7 @@ <!-- Test*NOUI* --> <junit forkmode="perTest" showoutput="true" fork="true" haltonerror="off" timeout="${batchtest.timeout}"> <env key="${system.env.library.path}" path="${obj.all.paths}"/> - <jvmarg value="${jvmarg.arch}"/> + <jvmarg value="${jvmDataModel.arg}"/> <jvmarg value="-Djava.library.path=${obj.all.paths}"/> <!-- @@ -217,7 +215,7 @@ failonerror="false"> <env key="${system.env.library.path}" path="${obj.all.paths}"/> <env key="CLASSPATH" value="${junit_jogl_noawt.run.jars}"/> - <arg line="${jvmarg.arch}"/> + <arg line="${jvmDataModel.arg}"/> <arg value="-Djava.library.path=${obj.all.paths}"/> <arg line="${jvmarg.headless}"/> <!-- @@ -252,7 +250,7 @@ <!-- Test*NEWT* --> <junit forkmode="perTest" showoutput="true" fork="true" haltonerror="off" timeout="${batchtest.timeout}"> <env key="${system.env.library.path}" path="${obj.all.paths}"/> - <jvmarg value="${jvmarg.arch}"/> + <jvmarg value="${jvmDataModel.arg}"/> <jvmarg value="-Djava.library.path=${obj.all.paths}"/> <!-- @@ -287,7 +285,7 @@ <!-- Test*AWT* --> <junit forkmode="perTest" showoutput="true" fork="true" haltonerror="off" timeout="${batchtest.timeout}"> <env key="${system.env.library.path}" path="${obj.all.paths}"/> - <jvmarg value="${jvmarg.arch}"/> + <jvmarg value="${jvmDataModel.arg}"/> <jvmarg value="-Djava.library.path=${obj.all.paths}"/> <!-- @@ -322,7 +320,7 @@ <!-- Test*AWT* --> <junit forkmode="perTest" showoutput="true" fork="true" haltonerror="off" timeout="${batchtest.timeout}"> <env key="${system.env.library.path}" path="${obj.all.paths}"/> - <jvmarg value="${jvmarg.arch}"/> + <jvmarg value="${jvmDataModel.arg}"/> <jvmarg value="-Djava.library.path=${obj.all.paths}"/> <!-- @@ -380,7 +378,7 @@ failonerror="false"> <env key="${system.env.library.path}" path="${obj.all.paths}"/> <env key="CLASSPATH" value="${junit_jogl_swt.run.jars}"/> - <arg line="${jvmarg.arch}"/> + <arg line="${jvmDataModel.arg}"/> <arg value="-Djava.library.path=${obj.all.paths}"/> <arg line="${jvmarg.headless}"/> <!-- @@ -412,7 +410,7 @@ <!-- Test*SWT* --> <junit forkmode="perTest" showoutput="true" fork="true" haltonerror="off" timeout="${batchtest.timeout}"> <env key="${system.env.library.path}" path="${obj.all.paths}"/> - <jvmarg value="${jvmarg.arch}"/> + <jvmarg value="${jvmDataModel.arg}"/> <jvmarg value="-Djava.library.path=${obj.all.paths}"/> <jvmarg value="${jvmarg.mainthrd}"/> @@ -446,7 +444,7 @@ <target name="junit.run.newt.awt" depends="test.compile"> <!-- Test*AWT* --> <junit forkmode="perTest" showoutput="true" fork="true" haltonerror="off" timeout="${batchtest.timeout}"> - <jvmarg value="${jvmarg.arch}"/> + <jvmarg value="${jvmDataModel.arg}"/> <env key="${system.env.library.path}" path="${obj.all.paths}"/> <jvmarg value="-Djava.library.path=${obj.all.paths}"/> |