formatting; fix junitreport by enabling XML formatter; parameterize junit forking

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/branches/collections_jdk5_branch@738939 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Matthew Jason Benson 2009-01-29 17:51:26 +00:00
parent b8a5292f3b
commit b1311a218c
1 changed files with 55 additions and 52 deletions

View File

@ -112,6 +112,7 @@ limitations under the License.
<!-- JUnit --> <!-- JUnit -->
<property name="test.failonerror" value="true"/> <property name="test.failonerror" value="true"/>
<property name="test.fork" value="true"/>
<!-- Maven --> <!-- Maven -->
<property name="maven.repo" value="${user.home}/.maven/repository" /> <property name="maven.repo" value="${user.home}/.maven/repository" />
@ -309,6 +310,7 @@ limitations under the License.
<path id="build.path"> <path id="build.path">
<pathelement location="${build.classes}" /> <pathelement location="${build.classes}" />
</path> </path>
<target name="instrument" <target name="instrument"
depends="compile.tests" depends="compile.tests"
description="Instruments the compiled classes and moves them to the instrumentation directory"> description="Instruments the compiled classes and moves them to the instrumentation directory">
@ -337,8 +339,9 @@ limitations under the License.
<jvmarg value="-Demma.coverage.out.merge=true" /> <jvmarg value="-Demma.coverage.out.merge=true" />
<jvmarg value="-Demma.verbosity.level=quiet" /> <jvmarg value="-Demma.verbosity.level=quiet" />
<formatter type="xml" />
<formatter type="plain" /> <formatter type="plain" />
<batchtest fork="yes" todir="${build.reports.test}"> <batchtest fork="${test.fork}" todir="${build.reports.test}">
<fileset dir="${source.test}"> <fileset dir="${source.test}">
<include name="**/Test*.java"/> <include name="**/Test*.java"/>
<exclude name="**/TestAll*.java"/> <exclude name="**/TestAll*.java"/>
@ -348,6 +351,8 @@ limitations under the License.
<exclude name="**/TestHashMap.java"/> <exclude name="**/TestHashMap.java"/>
<exclude name="**/TestTreeMap.java"/> <exclude name="**/TestTreeMap.java"/>
<exclude name="**/TestTypedCollection.java"/> <exclude name="**/TestTypedCollection.java"/>
<exclude name="**/TestAnyAllOnePredicate.java"/>
<exclude name="**/TestCompositePredicate.java"/>
</fileset> </fileset>
</batchtest> </batchtest>
</junit> </junit>
@ -369,7 +374,7 @@ limitations under the License.
<path refid="test.support.path"/> <path refid="test.support.path"/>
</classpath> </classpath>
<test name="${testcase}" fork="yes"> <test name="${testcase}" fork="${test.fork}">
<formatter type="brief" usefile="false" /> <formatter type="brief" usefile="false" />
</test> </test>
</junit> </junit>
@ -388,7 +393,6 @@ limitations under the License.
</emma> </emma>
</target> </target>
<!-- ====================================================================== --> <!-- ====================================================================== -->
<target name="testjar" depends="compile.tests,jar" <target name="testjar" depends="compile.tests,jar"
@ -401,7 +405,7 @@ limitations under the License.
<path refid="test.support.path"/> <path refid="test.support.path"/>
</classpath> </classpath>
<batchtest fork="yes"> <batchtest fork="${test.fork}">
<fileset dir="${source.test}"> <fileset dir="${source.test}">
<include name="**/TestAllPackages.java"/> <include name="**/TestAllPackages.java"/>
</fileset> </fileset>
@ -565,8 +569,7 @@ limitations under the License.
</copy> </copy>
</target> </target>
<target name="dist.create" depends="jar,testjar,tf.validate,tf.jar,dist.bin,dist.src"> <target name="dist.create" depends="jar,testjar,tf.validate,tf.jar,dist.bin,dist.src" />
</target>
<target name="dist.bin"> <target name="dist.bin">
<copy todir="${build.src}"> <copy todir="${build.src}">