[2/2] git commit: Merge branch 'cassandra-2.1' into trunk

[jake]

Merge branch 'cassandra-2.1' into trunk

Conflicts:
        build.xml
        test/unit/org/apache/cassandra/cli/CliTest.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8322ec27
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8322ec27
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8322ec27

Branch: refs/heads/trunk
Commit: 8322ec27ca182315ff53f6ce8dbbbde9e9fe793d
Parents: eb39639 23893ea
Author: Jake Luciani <j...@apache.org>
Authored: Wed Jun 25 17:46:07 2014 -0400
Committer: Jake Luciani <j...@apache.org>
Committed: Wed Jun 25 17:46:07 2014 -0400

----------------------------------------------------------------------
 build.xml                                       | 80 +++++++++++++++++++-
 .../OffsetAwareConfigurationLoader.java         | 63 +++++++++++++++
 test/unit/org/apache/cassandra/cli/CliTest.java |  3 +-
 3 files changed, 141 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8322ec27/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index d87da52,c34bcfc..5e4a85b
--- a/build.xml
+++ b/build.xml
@@@ -1073,14 -1066,9 +1074,16 @@@
      <element name="optjvmargs" implicit="true" optional="true" />
      <attribute name="filter" default="**/${test.name}.java"/>
      <attribute name="exclude" default="" />
+     <attribute name="filelist" default="" />
+     <attribute name="poffset" default="0"/>
 +    
 +    <attribute name="usejacoco" default="no"/>
      <sequential>
 +      <condition property="additionalagent"
 +                 
value="-javaagent:${build.dir.lib}/jars/jacocoagent.jar=destfile=${jacoco.execfile}"
 +                 else="">
 +        <istrue value="${usejacoco}"/>
 +      </condition>
        <echo message="running @{suitename} tests"/>
        <mkdir dir="${build.test.dir}/cassandra"/>
        <mkdir dir="${build.test.dir}/output"/>
@@@ -1161,19 -1151,18 +1166,30 @@@
          <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>
  
 +  <!--
 +    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>
 +
    <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}"/>

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8322ec27/test/unit/org/apache/cassandra/cli/CliTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/cli/CliTest.java
index 8c5a848,38f567b..568ebf3
--- a/test/unit/org/apache/cassandra/cli/CliTest.java
+++ b/test/unit/org/apache/cassandra/cli/CliTest.java
@@@ -19,10 -19,8 +19,11 @@@
  package org.apache.cassandra.cli;
  
  import org.apache.cassandra.SchemaLoader;
 +import org.apache.cassandra.config.KSMetaData;
+ import org.apache.cassandra.config.DatabaseDescriptor;
  import org.apache.cassandra.config.Schema;
 +import org.apache.cassandra.exceptions.ConfigurationException;
 +import org.apache.cassandra.locator.SimpleStrategy;
  import org.apache.cassandra.service.EmbeddedCassandraService;
  import org.apache.cassandra.thrift.*;
  import org.apache.thrift.TException;