diff options
Diffstat (limited to 'make/build-test.xml')
| -rw-r--r-- | make/build-test.xml | 79 |
1 files changed, 75 insertions, 4 deletions
diff --git a/make/build-test.xml b/make/build-test.xml index 40bdcf7a3..3c34abda1 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -87,8 +87,15 @@ <fileset file="${jogl.test.jar}" /> </delete> <jar destfile="${jogl.test.jar}" filesonly="true"> + <!-- get all class files, but skip any resource files that external tools + might have copied into the class directory (otherwise, it's possible + to get the same resource file twice in the jar) --> <fileset dir="${classes}"> - <include name="${java.part.test}"/> + <include name="${java.part.test}/*.class"/> + </fileset> + <!-- include any resource files that tests may requre --> + <fileset dir="${src.test}"> + <exclude name="**/*.java"/> </fileset> </jar> </target> @@ -137,6 +144,38 @@ <antcall target="test-zip-archive" inheritRefs="true" inheritAll="true"/> </target> + <target name="junit.run.noui" depends="test.compile"> + <!-- 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="-Djava.library.path=${obj.all.paths}"/> + + <!-- + <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="-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}/**/Test*NOUI*"/> + <exclude name="**/*$$*"/> + </fileset> + <formatter usefile="false" type="brief"/> + <formatter usefile="true" type="xml"/> + </batchtest> + </junit> + </target> + <!-- NEWT is currently not supported on OSX --> <target name="junit.run.newt.headless" depends="test.compile" unless="isOSX"> <!-- Test*NEWT* @@ -245,13 +284,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"/> @@ -265,6 +302,7 @@ <fileset dir="${classes}"> <include name="${java.dir.junit}/**/Test*AWT*"/> <exclude name="**/*$$*"/> + <exclude name="**/*SWT*"/> <exclude name="**/newt/**"/> </fileset> <formatter usefile="false" type="brief"/> @@ -273,6 +311,39 @@ </junit> </target> + <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="-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="-verbose:jni"/> + <jvmarg value="-client"/> + <jvmarg value="-d32"/> + --> + + <formatter usefile="false" type="plain"/> + <formatter usefile="true" type="xml"/> + <classpath refid="junit_jogl_swt.run.classpath"/> + + <batchtest todir="${results.test}"> + <fileset dir="${classes}"> + <include name="${java.dir.junit}/**/Test*SWT*"/> + <exclude name="**/*$$*"/> + <exclude name="**/newt/**"/> + </fileset> + <formatter usefile="false" type="brief"/> + <formatter usefile="true" type="xml"/> + </batchtest> + </junit> + </target> + <!-- NEWT is currently not supported on OSX --> <target name="junit.run.newt.awt" depends="test.compile" unless="isOSX"> <!-- Test*AWT* --> @@ -309,7 +380,7 @@ </target> <target name="test.auto.run" depends="junit.run"/> - <target name="junit.run" depends="junit.run.newt.headless,junit.run.awt,junit.run.newt.awt"> + <target name="junit.run" depends="junit.run.noui,junit.run.newt.headless,junit.run.awt,junit.run.newt.awt"> <antcall target="test-zip-archive" inheritRefs="true" inheritAll="true"/> </target> |