You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2014/02/02 08:37:49 UTC
[3/7] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
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/23e86ee1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/23e86ee1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/23e86ee1
Branch: refs/heads/trunk
Commit: 23e86ee15c88068385ca9bb4b14b4501fc0ef231
Parents: 0191b35 9a024b8
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jan 31 12:20:41 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Jan 31 12:20:41 2014 -0600
----------------------------------------------------------------------
build.xml | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/23e86ee1/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index 65d6b8c,667dbe2..a1498b8
--- a/build.xml
+++ b/build.xml
@@@ -1075,10 -1110,9 +1075,10 @@@
</target>
<target name="test" depends="build-test" description="Execute unit tests">
- <testmacro suitename="unit" inputdir="${test.unit.src}" timeout="60000">
+ <testmacro suitename="unit" inputdir="${test.unit.src}" 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>
@@@ -1085,10 -1122,9 +1088,10 @@@
</target>
<target name="test-compression" depends="build-test" description="Execute unit tests with sstable compression enabled">
- <testmacro suitename="unit" inputdir="${test.unit.src}" timeout="60000">
+ <testmacro suitename="unit" inputdir="${test.unit.src}" 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"/>