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 2014/02/07 20:21:49 UTC
[1/6] git commit: add target to run specific test methods
Updated Branches:
refs/heads/cassandra-1.2 2dd55c7d3 -> c70f6d80b
refs/heads/cassandra-2.0 7407cf981 -> 130d135a6
refs/heads/trunk 4c0b4fa2e -> 01cf29c3e
add target to run specific test methods
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c70f6d80
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c70f6d80
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c70f6d80
Branch: refs/heads/cassandra-1.2
Commit: c70f6d80bd26904e0ff34136bf598d701f1ed69d
Parents: 2dd55c7
Author: Brandon Williams <br...@apache.org>
Authored: Fri Feb 7 13:19:26 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Feb 7 13:19:26 2014 -0600
----------------------------------------------------------------------
build.xml | 12 ++++++++++++
1 file changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c70f6d80/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index ce87a2a..eaf35b5 100644
--- a/build.xml
+++ b/build.xml
@@ -56,6 +56,7 @@
<property name="test.conf" value="${test.dir}/conf"/>
<property name="test.data" value="${test.dir}/data"/>
<property name="test.name" value="*Test"/>
+ <property name="test.methods" value=""/>
<property name="test.unit.src" value="${test.dir}/unit"/>
<property name="test.long.src" value="${test.dir}/long"/>
<property name="dist.dir" value="${build.dir}/dist"/>
@@ -1118,6 +1119,17 @@
<jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
</testmacro>
</target>
+
+ <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}"/>
+ <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"/>
+ </testmacro>
+ </target>
<target name="test-compression" depends="build-test" description="Execute unit tests with sstable compression enabled">
<testmacro suitename="unit" inputdir="${test.unit.src}" exclude="**/pig/*.java" timeout="${test.timeout}">
[2/6] git commit: add target to run specific test methods
Posted by br...@apache.org.
add target to run specific test methods
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c70f6d80
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c70f6d80
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c70f6d80
Branch: refs/heads/cassandra-2.0
Commit: c70f6d80bd26904e0ff34136bf598d701f1ed69d
Parents: 2dd55c7
Author: Brandon Williams <br...@apache.org>
Authored: Fri Feb 7 13:19:26 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Feb 7 13:19:26 2014 -0600
----------------------------------------------------------------------
build.xml | 12 ++++++++++++
1 file changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c70f6d80/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index ce87a2a..eaf35b5 100644
--- a/build.xml
+++ b/build.xml
@@ -56,6 +56,7 @@
<property name="test.conf" value="${test.dir}/conf"/>
<property name="test.data" value="${test.dir}/data"/>
<property name="test.name" value="*Test"/>
+ <property name="test.methods" value=""/>
<property name="test.unit.src" value="${test.dir}/unit"/>
<property name="test.long.src" value="${test.dir}/long"/>
<property name="dist.dir" value="${build.dir}/dist"/>
@@ -1118,6 +1119,17 @@
<jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
</testmacro>
</target>
+
+ <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}"/>
+ <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"/>
+ </testmacro>
+ </target>
<target name="test-compression" depends="build-test" description="Execute unit tests with sstable compression enabled">
<testmacro suitename="unit" inputdir="${test.unit.src}" exclude="**/pig/*.java" timeout="${test.timeout}">
[6/6] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/01cf29c3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/01cf29c3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/01cf29c3
Branch: refs/heads/trunk
Commit: 01cf29c3e9dac62495d360905323dd0dc4f9b47a
Parents: 4c0b4fa 130d135
Author: Brandon Williams <br...@apache.org>
Authored: Fri Feb 7 13:19:50 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Feb 7 13:19:50 2014 -0600
----------------------------------------------------------------------
build.xml | 12 ++++++++++++
1 file changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/01cf29c3/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index d36b39e,bfbd8b2..d91e0e0
--- a/build.xml
+++ b/build.xml
@@@ -1116,10 -1084,18 +1117,21 @@@
<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="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}"/>
+ <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"/>
+ </testmacro>
+ </target>
<target name="test-compression" depends="build-test" description="Execute unit tests with sstable compression enabled">
<testmacro suitename="unit" inputdir="${test.unit.src}" exclude="**/pig/*.java" timeout="${test.timeout}">
[5/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/130d135a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/130d135a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/130d135a
Branch: refs/heads/cassandra-2.0
Commit: 130d135a63b213844270e3f94e5b07658ac897dd
Parents: 7407cf9 c70f6d8
Author: Brandon Williams <br...@apache.org>
Authored: Fri Feb 7 13:19:38 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Feb 7 13:19:38 2014 -0600
----------------------------------------------------------------------
build.xml | 12 ++++++++++++
1 file changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/130d135a/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index 6804a1b,eaf35b5..bfbd8b2
--- a/build.xml
+++ b/build.xml
@@@ -55,13 -56,13 +55,14 @@@
<property name="test.conf" value="${test.dir}/conf"/>
<property name="test.data" value="${test.dir}/data"/>
<property name="test.name" value="*Test"/>
+ <property name="test.methods" value=""/>
<property name="test.unit.src" value="${test.dir}/unit"/>
<property name="test.long.src" value="${test.dir}/long"/>
+ <property name="test.pig.src" value="${test.dir}/pig"/>
<property name="dist.dir" value="${build.dir}/dist"/>
- <property name="source.version" value="1.6"/>
- <property name="target.version" value="1.6"/>
+ <property name="source.version" value="1.7"/>
+ <property name="target.version" value="1.7"/>
<condition property="version" value="${base.version}">
<isset property="release"/>
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/130d135a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/130d135a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/130d135a
Branch: refs/heads/trunk
Commit: 130d135a63b213844270e3f94e5b07658ac897dd
Parents: 7407cf9 c70f6d8
Author: Brandon Williams <br...@apache.org>
Authored: Fri Feb 7 13:19:38 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Feb 7 13:19:38 2014 -0600
----------------------------------------------------------------------
build.xml | 12 ++++++++++++
1 file changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/130d135a/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index 6804a1b,eaf35b5..bfbd8b2
--- a/build.xml
+++ b/build.xml
@@@ -55,13 -56,13 +55,14 @@@
<property name="test.conf" value="${test.dir}/conf"/>
<property name="test.data" value="${test.dir}/data"/>
<property name="test.name" value="*Test"/>
+ <property name="test.methods" value=""/>
<property name="test.unit.src" value="${test.dir}/unit"/>
<property name="test.long.src" value="${test.dir}/long"/>
+ <property name="test.pig.src" value="${test.dir}/pig"/>
<property name="dist.dir" value="${build.dir}/dist"/>
- <property name="source.version" value="1.6"/>
- <property name="target.version" value="1.6"/>
+ <property name="source.version" value="1.7"/>
+ <property name="target.version" value="1.7"/>
<condition property="version" value="${base.version}">
<isset property="release"/>
[3/6] git commit: add target to run specific test methods
Posted by br...@apache.org.
add target to run specific test methods
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c70f6d80
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c70f6d80
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c70f6d80
Branch: refs/heads/trunk
Commit: c70f6d80bd26904e0ff34136bf598d701f1ed69d
Parents: 2dd55c7
Author: Brandon Williams <br...@apache.org>
Authored: Fri Feb 7 13:19:26 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Feb 7 13:19:26 2014 -0600
----------------------------------------------------------------------
build.xml | 12 ++++++++++++
1 file changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c70f6d80/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index ce87a2a..eaf35b5 100644
--- a/build.xml
+++ b/build.xml
@@ -56,6 +56,7 @@
<property name="test.conf" value="${test.dir}/conf"/>
<property name="test.data" value="${test.dir}/data"/>
<property name="test.name" value="*Test"/>
+ <property name="test.methods" value=""/>
<property name="test.unit.src" value="${test.dir}/unit"/>
<property name="test.long.src" value="${test.dir}/long"/>
<property name="dist.dir" value="${build.dir}/dist"/>
@@ -1118,6 +1119,17 @@
<jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
</testmacro>
</target>
+
+ <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}"/>
+ <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"/>
+ </testmacro>
+ </target>
<target name="test-compression" depends="build-test" description="Execute unit tests with sstable compression enabled">
<testmacro suitename="unit" inputdir="${test.unit.src}" exclude="**/pig/*.java" timeout="${test.timeout}">