diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-test.xml (renamed from make/build-junit.xml) | 21 | ||||
| -rw-r--r-- | make/build.xml | 4 |
2 files changed, 18 insertions, 7 deletions
diff --git a/make/build-junit.xml b/make/build-test.xml index 3a6f66e..222ab93 100644 --- a/make/build-junit.xml +++ b/make/build-test.xml @@ -87,6 +87,8 @@ <!-- Add the GlueGen tasks to ANT --> <taskdef name="gluegen" classname="com.jogamp.gluegen.ant.GlueGenTask" classpathref="gluegen.classpath" /> + + <property name="test.archive.name" value="${archive.name}-test-results"/> </target> <target name="java.build" depends="java.generate"> @@ -169,6 +171,12 @@ </macrodef> <target name="junit.compile.check" depends="init"> + <delete quiet="true"> + <fileset dir="${build}/test/results" includes="**"/> + <fileset file="${build}/${test.archive.name}.zip"/> + </delete> + <mkdir dir="${build}/test/results"/> + <uptodate property="junit.compile.skip"> <srcfiles dir= "." includes="*.xml"/> <srcfiles dir= "${test.base.dir}" includes="**"/> @@ -185,11 +193,6 @@ </target> <target name="junit.run" depends="init,gluegen.cpptasks.detect.os"> - <delete quiet="true"> - <fileset dir="${build}/test/results" includes="**"/> - </delete> - <mkdir dir="${build}/test/results"/> - <!-- Use absolute path --> <property name="gluegen.lib.abs" location="${gluegen.lib}" /> <property name="build_t.lib.abs" location="${build_t.lib}" /> @@ -219,6 +222,7 @@ <formatter usefile="true" type="xml"/> </batchtest> </junit> + <antcall target="test-zip-archive" inheritRefs="true" /> </target> <!-- @@ -360,4 +364,11 @@ --> + <!-- updates / create the test results zip file --> + <target name="test-zip-archive" depends="init"> + <zip destfile="${build}/${test.archive.name}.zip" update="true"> + <zipfileset dir="${build}/test/results" prefix="${archive.name}/test-results"/> + </zip> + </target> + </project> diff --git a/make/build.xml b/make/build.xml index c0ce8cd..0fa81a8 100644 --- a/make/build.xml +++ b/make/build.xml @@ -713,11 +713,11 @@ </target> <target name="junit.compile" depends="init"> - <ant antfile="build-junit.xml" target="junit.compile"/> + <ant antfile="build-test.xml" target="junit.compile"/> </target> <target name="junit.run" depends="junit.compile"> - <ant antfile="build-junit.xml" target="junit.run"/> + <ant antfile="build-test.xml" target="junit.run"/> </target> <target name="javadoc" depends="init"> |