diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-junit.xml | 17 | ||||
| -rw-r--r-- | make/build.xml | 37 |
2 files changed, 11 insertions, 43 deletions
diff --git a/make/build-junit.xml b/make/build-junit.xml index b28dce1..3a6f66e 100644 --- a/make/build-junit.xml +++ b/make/build-junit.xml @@ -22,9 +22,8 @@ <property name="make" value="." /> <property name="test.base.dir" value="${gluegen.root}/src/junit" /> - <property name="test.junit.rel" value="com/jogamp/gluegen/test/junit" /> - <property name="test.junit.dir" value="${test.base.dir}/${test.junit.rel}" /> - <property name="test.junit.generation.rel" value="${test.junit.rel}/generation" /> + <property name="test.junit.rel" value="com/jogamp" /> + <property name="test.junit.generation.rel" value="${test.junit.rel}/gluegen/test/junit/generation" /> <property name="test.junit.generation.dir" value="${test.base.dir}/${test.junit.generation.rel}" /> <property name="test.dir" value="${gluegen.root}/${rootrel.build}/test"/> @@ -64,19 +63,18 @@ <path id="junit.compile.classpath"> <pathelement location="${junit.jar}" /> - <pathelement location="${gluegen-rt.jar}" /> + <pathelement location="${gluegen.jar}" /> </path> <path id="junit.run.classpath"> <pathelement location="${junit.jar}" /> - <pathelement location="${gluegen-rt.jar}" /> + <pathelement location="${gluegen.jar}" /> <pathelement location="${gluegen-test.jar}" /> </path> <property name="stub.includes.dir" value="stub_includes" /> <!-- NOTE: this MUST be relative for FileSet --> <echo message="test.base.dir: ${test.base.dir} "/> - <echo message="test.junit.dir: ${test.junit.dir} "/> <echo message="test.junit.generation.dir: ${test.junit.generation.dir} "/> <echo message="test.dir: ${test.dir} "/> <echo message="results: ${results} "/> @@ -180,12 +178,18 @@ </target> <target name="junit.compile" depends="junit.compile.check" unless="junit.compile.skip"> + <mkdir dir="${build}/test/build/classes"/> <antcall target="java.generate" inheritRefs="true"/> <antcall target="java.build" inheritRefs="true"/> <antcall target="native.build" inheritRefs="true"/> </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}" /> @@ -325,7 +329,6 @@ <param name="src" value="${build_t.lib}/libBindingtest1p1.dylib" /> <param name="dest" value="${build_t.lib}/libBindingtest1p1.jnilib" /> </antcall> - </target> <!-- this is a dynamic lookup binding to the test1 implementation --> diff --git a/make/build.xml b/make/build.xml index 2241ef2..c0ce8cd 100644 --- a/make/build.xml +++ b/make/build.xml @@ -712,46 +712,11 @@ <echo message='gluegen.build.commit=${gluegen.build.commit}${line.separator}' file="${build}/artifact.properties" append="true"/> </target> - <target name="junit.compile" depends="init, gluegen.cpptasks.detect.os"> - <mkdir dir="${build}/test/build/classes"/> - - <javac destdir="${build}/test/build/classes" srcdir="${gluegen.root}/test/junit" source="1.5" failonerror="false" - debug="true" debuglevel="lines,vars,source" includeAntRuntime="false" - excludes="com/jogamp/gluegen/StructValidator.java"> - <classpath path="${junit.jar}:${build}/classes:${build}/test/gensrc/java:${tools.jar}:${ant.core.lib}"/> - </javac> - + <target name="junit.compile" depends="init"> <ant antfile="build-junit.xml" target="junit.compile"/> </target> <target name="junit.run" depends="junit.compile"> - <mkdir dir="${build}/test/results"/> - <delete quiet="true"> - <fileset dir="${build}/test/results" includes="**"/> - </delete> - - <junit forkmode="once" showoutput="true" fork="true" includeAntRuntime="true"> - <env key="${system.env.library.path}" path="${gluegen.lib.dir}${path.separator}${build}/test/build/natives"/> - <jvmarg value="-Djava.library.path=${gluegen.lib.dir}${path.separator}${build}/test/build/natives"/> - <jvmarg value="-Drootrel.build=${rootrel.build}"/> - <jvmarg value="-Dos.arch=${os.arch}"/> - <jvmarg value="-Dgluegen.user.compiler.file=${gluegen.user.compiler.file}"/> - <batchtest todir="${build}/test/results"> - <fileset dir="${build}/test/build/classes"> - <include name="com/jogamp/gluegen/**Test*"/> - <include name="com/jogamp/common/nio/**Test*"/> - <include name="com/jogamp/common/util/**Test*"/> - <include name="com/jogamp/common/util/locks/**Test*"/> - <exclude name="**/*$$*"/> - </fileset> - <formatter usefile="false" type="plain"/> - <formatter usefile="true" type="xml"/> - </batchtest> - <classpath> - <path path="${build}/test/build/classes:${build}/test/gensrc/java:${build}/gluegen-rt.jar:${build}/gluegen.jar:${antlr.jar}:${junit.jar}:${tools.jar}:${ant.core.lib}"/> - </classpath> - </junit> - <ant antfile="build-junit.xml" target="junit.run"/> </target> |