cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [5/7] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Date Sun, 02 Feb 2014 07:37:51 GMT
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/8ecc6f11
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8ecc6f11
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8ecc6f11

Branch: refs/heads/trunk
Commit: 8ecc6f1118e49bdfd350321df9ace36b32e734b0
Parents: 23e86ee 3f9875c
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Fri Jan 31 14:08:15 2014 -0600
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Fri Jan 31 14:08:15 2014 -0600

----------------------------------------------------------------------
 build.xml | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8ecc6f11/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index a1498b8,150e2fe..6804a1b
--- a/build.xml
+++ b/build.xml
@@@ -1074,24 -1110,19 +1075,21 @@@
      </junit>
    </target>
  
-   <target name="test" depends="build-test" description="Execute unit tests">
-     <testmacro suitename="unit" inputdir="${test.unit.src}" timeout="${test.timeout}">
+   <target name="test" depends="build-test" description="Execute unit tests" >
+     <testmacro suitename="unit" inputdir="${test.unit.src}" exclude="**/pig/*.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"/>
      </testmacro>
    </target>
      
    <target name="test-compression" depends="build-test" description="Execute unit tests
with sstable compression enabled">
-       <testmacro suitename="unit" inputdir="${test.unit.src}" timeout="${test.timeout}">
+       <testmacro suitename="unit" inputdir="${test.unit.src}" exclude="**/pig/*.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.test.compression=true"/>
        <jvmarg value="-Dcassandra.ring_delay_ms=1000"/>
        <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>


Mime
View raw message