summaryrefslogtreecommitdiffstats
path: root/make/build-test.xml
diff options
context:
space:
mode:
Diffstat (limited to 'make/build-test.xml')
-rw-r--r--make/build-test.xml10
1 files changed, 3 insertions, 7 deletions
diff --git a/make/build-test.xml b/make/build-test.xml
index b51e2e6c3..a2fbdd8b7 100644
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -277,13 +277,11 @@
<jvmarg value="-Djava.library.path=${obj.all.paths}"/>
<!--
- <jvmarg value="-Dnewt.debug.EDT"/>
<jvmarg value="-Djogl.debug=all"/>
<jvmarg value="-Dgluegen.debug.NativeLibrary=true"/>
<jvmarg value="-Dgluegen.debug.ProcAddressHelper=true"/>
<jvmarg value="-Djogl.debug.GLSLState"/>
<jvmarg value="-Dnativewindow.debug=all"/>
- <jvmarg value="-Dnewt.debug=all"/>
<jvmarg value="-verbose:jni"/>
<jvmarg value="-client"/>
<jvmarg value="-d32"/>
@@ -306,20 +304,18 @@
</junit>
</target>
- <target name="junit.run.swt" depends="junit.run.setup" description="Runs all SWT and SWT_AWT tests.">
+ <target name="junit.run.swt" depends="test.compile" description="Runs all SWT and SWT_AWT tests.">
<!-- 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="-Djava.library.path=${obj.all.paths}"/>
<!--
- <jvmarg value="-Dnewt.debug.EDT"/>
<jvmarg value="-Djogl.debug=all"/>
<jvmarg value="-Dgluegen.debug.NativeLibrary=true"/>
<jvmarg value="-Dgluegen.debug.ProcAddressHelper=true"/>
<jvmarg value="-Djogl.debug.GLSLState"/>
<jvmarg value="-Dnativewindow.debug=all"/>
- <jvmarg value="-Dnewt.debug=all"/>
<jvmarg value="-verbose:jni"/>
<jvmarg value="-client"/>
<jvmarg value="-d32"/>
@@ -329,9 +325,9 @@
<formatter usefile="true" type="xml"/>
<classpath refid="junit_jogl_swt.run.classpath"/>
- <batchtest todir="${results.junit}">
+ <batchtest todir="${results.test}">
<fileset dir="${classes}">
- <include name="${java.dir.test}/**/Test*SWT*"/>
+ <include name="${java.dir.junit}/**/Test*SWT*"/>
<exclude name="**/*$$*"/>
<exclude name="**/newt/**"/>
</fileset>