diff options
| author | Sven Gothel <[email protected]> | 2013-02-17 03:27:36 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2013-02-17 03:27:36 +0100 |
| commit | 68cc962abb7ca422bb9af6f4a5366eb2b428e04f (patch) | |
| tree | 360a06e84e353940020cb19231a3fa5a28d77f3b /make | |
| parent | 8edaa9780455b60f6034a78970cab4f516d4b061 (diff) | |
build-test.xml: Move 'junit.run.newt.awt' up in file; 'junit.run.newt': Exclude *AWT* and *SWT* (similar to 'junit.run.newt.headless')
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-test.xml | 78 |
1 files changed, 40 insertions, 38 deletions
diff --git a/make/build-test.xml b/make/build-test.xml index ce690187e..edef389cf 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -358,6 +358,8 @@ <fileset dir="${classes}"> <include name="${java.dir.junit}/**/Test*NEWT*"/> <exclude name="**/*$$*"/> + <exclude name="**/*AWT*"/> + <exclude name="**/*SWT*"/> </fileset> <formatter usefile="false" type="brief"/> <formatter usefile="true" type="xml"/> @@ -402,6 +404,44 @@ </junit> </target> + <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="${junit.run.arg0}"/> + <jvmarg value="${junit.run.arg1}"/> + <jvmarg value="${jvmDataModel.arg}"/> + <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"/> + --> + + <formatter usefile="false" type="plain"/> + <formatter usefile="true" type="xml"/> + <classpath refid="junit_jogl_awt.run.classpath"/> + + <batchtest todir="${results.test}"> + <fileset dir="${classes}"> + <include name="${java.dir.junit}/**/newt/**/Test*AWT*"/> + <!--include name="${java.dir.junit}/**/newt/**/TestNewtEventModifiers*AWT*"/--> + <exclude name="**/*$$*"/> + </fileset> + <formatter usefile="false" type="brief"/> + <formatter usefile="true" type="xml"/> + </batchtest> + </junit> + </target> + <target name="junit.run.awt.singletest" depends="test.compile"> <!-- Test*AWT* --> <junit forkmode="perTest" showoutput="true" fork="true" haltonerror="off" timeout="${batchtest.timeout}"> @@ -560,44 +600,6 @@ </for> </target> - <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="${junit.run.arg0}"/> - <jvmarg value="${junit.run.arg1}"/> - <jvmarg value="${jvmDataModel.arg}"/> - <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"/> - --> - - <formatter usefile="false" type="plain"/> - <formatter usefile="true" type="xml"/> - <classpath refid="junit_jogl_awt.run.classpath"/> - - <batchtest todir="${results.test}"> - <fileset dir="${classes}"> - <include name="${java.dir.junit}/**/newt/**/Test*AWT*"/> - <!--include name="${java.dir.junit}/**/newt/**/TestNewtEventModifiers*AWT*"/--> - <exclude name="**/*$$*"/> - </fileset> - <formatter usefile="false" type="brief"/> - <formatter usefile="true" type="xml"/> - </batchtest> - </junit> - </target> - <target name="junit.run.local" unless="isCrosscompilation" > <antcall target="junit.run.noui" inheritRefs="true" inheritAll="true"/> <antcall target="junit.run.newt.headless" inheritRefs="true" inheritAll="true"/> |