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 <brandonwilli...@apache.org> Authored: Fri Feb 7 13:19:50 2014 -0600 Committer: Brandon Williams <brandonwilli...@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}">
