diff options
| author | Sven Gothel <[email protected]> | 2010-07-07 14:37:53 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2010-07-07 14:37:53 +0200 |
| commit | 5b6ecb0854825a624f82e63f3180c2e85d905f0f (patch) | |
| tree | 994d047fdf7732bcdc5228a990d933913652060f /make/build.xml | |
| parent | 8a95808d3762ee4645dd5de1f0b0844c254e8638 (diff) | |
| parent | e125cd5b1a20221b338cc4f03810b3b8b69004c9 (diff) | |
Merge branch 'master' of github.com:mbien/gluegen
Diffstat (limited to 'make/build.xml')
| -rwxr-xr-x | make/build.xml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/make/build.xml b/make/build.xml index 193c353..b881597 100755 --- a/make/build.xml +++ b/make/build.xml @@ -647,18 +647,18 @@ </delete> </target> - <target name="test" depends="init, gluegen.cpptasks.detect.os, junit.run"> + <target name="test" depends="init, gluegen.cpptasks.detect.os"> <mkdir dir="${build}/test/build/classes"/> <mkdir dir="${build}/test/results"/> <property name="tools.jar" value="${java.home}/../lib/tools.jar"/> - <javac destdir="${build}/test/build/classes" failonerror="false" source="1.5" srcdir="${gluegen.root}/test/junit" debug="true" debuglevel="lines,vars,source" - includeAntRuntime="false"> + <javac destdir="${build}/test/build/classes" srcdir="${gluegen.root}/test/junit" source="1.5" failonerror="false" + debug="true" debuglevel="lines,vars,source" includeAntRuntime="false"> <classpath path="${junit.jar}:${build}/classes:${build}/test/gensrc/java:${tools.jar}:${ant.core.lib}"/> </javac> - <junit forkmode="once" showoutput="true" fork="true"> + <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}"/> @@ -667,6 +667,7 @@ <batchtest todir="${build}/test/results"> <fileset dir="${build}/test/build/classes"> <include name="com/sun/gluegen/**Test*"/> + <include name="com/jogamp/common/nio/**Test*"/> <include name="com/jogamp/common/util/**Test*"/> </fileset> <formatter usefile="false" type="plain"/> |