cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [5/6] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Thu, 26 Feb 2015 17:51:06 GMT
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 <brandonwilliams@apache.org>
Authored: Thu Feb 26 09:48:50 2015 -0800
Committer: Brandon Williams <brandonwilliams@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}"/>


Mime
View raw message