Simplify test exclusions

Allow tests to be run without using Emma

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/trunk@1023757 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Sebastian Bazley 2010-10-18 12:08:50 +00:00
parent fcb2f44382
commit c41056bff9
1 changed files with 2 additions and 12 deletions

View File

@ -314,6 +314,7 @@ limitations under the License.
<target name="instrument" <target name="instrument"
depends="compile.tests" depends="compile.tests"
unless="emma.norun"
description="Instruments the compiled classes and moves them to the instrumentation directory"> description="Instruments the compiled classes and moves them to the instrumentation directory">
<emma> <emma>
<instr instrpathref="build.path" <instr instrpathref="build.path"
@ -325,7 +326,7 @@ limitations under the License.
</target> </target>
<!-- Runs all tests --> <!-- Runs all tests -->
<target name="-test-all" depends="instrument" unless="testcase"> <target name="-test-all" depends="compile.tests,instrument" unless="testcase">
<mkdir dir="${build.test.reports}" /> <mkdir dir="${build.test.reports}" />
<junit printsummary="yes" haltonfailure="${test.haltonfailure}" showoutput="yes"> <junit printsummary="yes" haltonfailure="${test.haltonfailure}" showoutput="yes">
@ -345,17 +346,6 @@ limitations under the License.
<batchtest fork="${test.fork}" todir="${build.test.reports}"> <batchtest fork="${test.fork}" todir="${build.test.reports}">
<fileset dir="${source.test}"> <fileset dir="${source.test}">
<include name="**/Test*.java"/> <include name="**/Test*.java"/>
<!-- Exclude groups of tests -->
<exclude name="**/TestAll.java"/>
<exclude name="**/TestAllPackages.java"/>
<!-- Exclude Asbtract classes -->
<exclude name="**/TestAbstract*"/>
<exclude name="**/TestArrayList.java"/>
<exclude name="**/TestLinkedList.java"/>
<exclude name="**/TestTreeMap.java"/>
<exclude name="**/TestTypedCollection.java"/>
<exclude name="**/TestAnyAllOnePredicate.java"/>
<exclude name="**/TestCompositePredicate.java"/>
<exclude name="**/TestUtils.java"/> <exclude name="**/TestUtils.java"/>
</fileset> </fileset>
</batchtest> </batchtest>