You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2010/10/18 14:08:50 UTC
svn commit: r1023757 - /commons/proper/collections/trunk/build.xml
Author: sebb
Date: Mon Oct 18 12:08:50 2010
New Revision: 1023757
URL: http://svn.apache.org/viewvc?rev=1023757&view=rev
Log:
Simplify test exclusions
Allow tests to be run without using Emma
Modified:
commons/proper/collections/trunk/build.xml
Modified: commons/proper/collections/trunk/build.xml
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/build.xml?rev=1023757&r1=1023756&r2=1023757&view=diff
==============================================================================
--- commons/proper/collections/trunk/build.xml (original)
+++ commons/proper/collections/trunk/build.xml Mon Oct 18 12:08:50 2010
@@ -314,6 +314,7 @@ limitations under the License.
<target name="instrument"
depends="compile.tests"
+ unless="emma.norun"
description="Instruments the compiled classes and moves them to the instrumentation directory">
<emma>
<instr instrpathref="build.path"
@@ -325,7 +326,7 @@ limitations under the License.
</target>
<!-- 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}" />
<junit printsummary="yes" haltonfailure="${test.haltonfailure}" showoutput="yes">
@@ -345,17 +346,6 @@ limitations under the License.
<batchtest fork="${test.fork}" todir="${build.test.reports}">
<fileset dir="${source.test}">
<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"/>
</fileset>
</batchtest>