You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2015/02/26 18:51:02 UTC
[1/6] cassandra git commit: add comment about using testsome target
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 da9f030c2 -> 98502e0c3
refs/heads/cassandra-2.1 2215c491c -> 322e8f059
refs/heads/trunk 2c15d8212 -> 847f413ea
add comment about using testsome target
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/98502e0c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/98502e0c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/98502e0c
Branch: refs/heads/cassandra-2.0
Commit: 98502e0c3fa3158df2fba6681a967238c77fa39d
Parents: da9f030
Author: Brandon Williams <br...@apache.org>
Authored: Thu Feb 26 09:48:40 2015 -0800
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Feb 26 09:48:40 2015 -0800
----------------------------------------------------------------------
build.xml | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/98502e0c/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 9bbb54f..78c6db3 100644
--- a/build.xml
+++ b/build.xml
@@ -1101,6 +1101,9 @@
</testmacro>
</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}"/>
[5/6] cassandra git commit: Merge branch 'cassandra-2.0' into
cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/322e8f05
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/322e8f05
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/322e8f05
Branch: refs/heads/cassandra-2.1
Commit: 322e8f05958c4a025079f1c1c428df8224b10e0d
Parents: 2215c49 98502e0
Author: Brandon Williams <br...@apache.org>
Authored: Thu Feb 26 09:48:50 2015 -0800
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Feb 26 09:48:50 2015 -0800
----------------------------------------------------------------------
build.xml | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/322e8f05/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index e969085,78c6db3..4ced4e2
--- a/build.xml
+++ b/build.xml
@@@ -1183,22 -1099,11 +1183,25 @@@
<jvmarg value="-Dcassandra.ring_delay_ms=1000"/>
<jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
</testmacro>
+ <fileset dir="${test.unit.src}">
+ <exclude name="**/pig/*.java" />
+ </fileset>
+ </target>
+
+ <target name="testlist">
+ <testmacro suitename="${testlist.name}" inputdir="${test.unit.src}" filelist="${test.file.list}" poffset="${testlist.offset}" exclude="**/*.java" timeout="${test.timeout}">
+ <jvmarg value="-Dlegacy-sstable-root=${test.data}/legacy-sstables"/>
+ <jvmarg value="-Dcorrupt-sstable-root=${test.data}/corrupt-sstables"/>
+ <jvmarg value="-Dmigration-sstable-root=${test.data}/migration-sstables"/>
+ <jvmarg value="-Dcassandra.ring_delay_ms=1000"/>
+ <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
+ <jvmarg value="-Dcassandra.config.loader=org.apache.cassandra.OffsetAwareConfigurationLoader"/>
+ </testmacro>
</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}"/>
[4/6] cassandra git commit: Merge branch 'cassandra-2.0' into
cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/322e8f05
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/322e8f05
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/322e8f05
Branch: refs/heads/trunk
Commit: 322e8f05958c4a025079f1c1c428df8224b10e0d
Parents: 2215c49 98502e0
Author: Brandon Williams <br...@apache.org>
Authored: Thu Feb 26 09:48:50 2015 -0800
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Feb 26 09:48:50 2015 -0800
----------------------------------------------------------------------
build.xml | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/322e8f05/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index e969085,78c6db3..4ced4e2
--- a/build.xml
+++ b/build.xml
@@@ -1183,22 -1099,11 +1183,25 @@@
<jvmarg value="-Dcassandra.ring_delay_ms=1000"/>
<jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
</testmacro>
+ <fileset dir="${test.unit.src}">
+ <exclude name="**/pig/*.java" />
+ </fileset>
+ </target>
+
+ <target name="testlist">
+ <testmacro suitename="${testlist.name}" inputdir="${test.unit.src}" filelist="${test.file.list}" poffset="${testlist.offset}" exclude="**/*.java" timeout="${test.timeout}">
+ <jvmarg value="-Dlegacy-sstable-root=${test.data}/legacy-sstables"/>
+ <jvmarg value="-Dcorrupt-sstable-root=${test.data}/corrupt-sstables"/>
+ <jvmarg value="-Dmigration-sstable-root=${test.data}/migration-sstables"/>
+ <jvmarg value="-Dcassandra.ring_delay_ms=1000"/>
+ <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
+ <jvmarg value="-Dcassandra.config.loader=org.apache.cassandra.OffsetAwareConfigurationLoader"/>
+ </testmacro>
</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}"/>
[6/6] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Posted by br...@apache.org.
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 <br...@apache.org>
Authored: Thu Feb 26 09:50:58 2015 -0800
Committer: Brandon Williams <br...@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}"/>
[3/6] cassandra git commit: add comment about using testsome target
Posted by br...@apache.org.
add comment about using testsome target
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/98502e0c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/98502e0c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/98502e0c
Branch: refs/heads/trunk
Commit: 98502e0c3fa3158df2fba6681a967238c77fa39d
Parents: da9f030
Author: Brandon Williams <br...@apache.org>
Authored: Thu Feb 26 09:48:40 2015 -0800
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Feb 26 09:48:40 2015 -0800
----------------------------------------------------------------------
build.xml | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/98502e0c/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 9bbb54f..78c6db3 100644
--- a/build.xml
+++ b/build.xml
@@ -1101,6 +1101,9 @@
</testmacro>
</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}"/>
[2/6] cassandra git commit: add comment about using testsome target
Posted by br...@apache.org.
add comment about using testsome target
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/98502e0c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/98502e0c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/98502e0c
Branch: refs/heads/cassandra-2.1
Commit: 98502e0c3fa3158df2fba6681a967238c77fa39d
Parents: da9f030
Author: Brandon Williams <br...@apache.org>
Authored: Thu Feb 26 09:48:40 2015 -0800
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Feb 26 09:48:40 2015 -0800
----------------------------------------------------------------------
build.xml | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/98502e0c/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 9bbb54f..78c6db3 100644
--- a/build.xml
+++ b/build.xml
@@ -1101,6 +1101,9 @@
</testmacro>
</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}"/>