Merge branch 'cassandra-2.1' into trunk
Conflicts:
build.xml
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/847f413e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/847f413e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/847f413e
Branch: refs/heads/trunk
Commit: 847f413ead4b57fee689d2bdc2364578c795c869
Parents: 2c15d82 322e8f0
Author: Brandon Williams <brandonwilli...@apache.org>
Authored: Thu Feb 26 09:50:58 2015 -0800
Committer: Brandon Williams <brandonwilli...@apache.org>
Committed: Thu Feb 26 09:50:58 2015 -0800
----------------------------------------------------------------------
build.xml | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/847f413e/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index 0b9d1a2,4ced4e2..6305556
--- a/build.xml
+++ b/build.xml
@@@ -1214,18 -1199,9 +1214,21 @@@
</testmacro>
</target>
+ <!--
+ Run named ant task with jacoco, such as "ant jacoco-run
-Dtaskname=pig-test"
+ the target run must enable the jacoco agent if usejacoco is 'yes' -->
+ <target name="jacoco-run" description="run named task with jacoco
instrumentation">
+ <condition property="runtask" value="${taskname}" else="test">
+ <isset property="taskname"/>
+ </condition>
+ <antcall target="${runtask}">
+ <param name="usejacoco" value="yes"/>
+ </antcall>
+ </target>
+
+ <!-- Use this with an FQDN for test class, and a csv list of methods like
this:
+ ant testsome
-Dtest.name=org.apache.cassandra.service.StorageServiceServerTest
-Dtest.methods=testRegularMode,testGetAllRangesEmpty
+ -->
<target name="testsome" depends="build-test" description="Execute specific
unit tests" >
<testmacro suitename="unit" inputdir="${test.unit.src}"
exclude="**/pig/*.java" timeout="${test.timeout}">
<test name="${test.name}" methods="${test.methods}"/>
