You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by yu...@apache.org on 2015/06/19 02:31:37 UTC
[1/3] cassandra git commit: Remove usage of suitename that is causing
some tasks to silently fail in cassci
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 55a736acf -> 947edf1f1
refs/heads/trunk e14ce11c0 -> e246ec258
Remove usage of suitename that is causing some tasks to silently fail in cassci
Follow up on CASSANDRA-9583
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/947edf1f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/947edf1f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/947edf1f
Branch: refs/heads/cassandra-2.2
Commit: 947edf1f19a8798b4befd9d598f3e17bbf3d7e48
Parents: 55a736a
Author: Ariel Weisberg <ar...@weisberg.ws>
Authored: Thu Jun 18 16:17:17 2015 -0400
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Jun 18 19:26:16 2015 -0500
----------------------------------------------------------------------
build.xml | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/947edf1f/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 82ec33e..d5e3869 100644
--- a/build.xml
+++ b/build.xml
@@ -1206,7 +1206,7 @@
</target>
<target name="testold" depends="build-test" description="Execute unit tests">
- <testmacro suitename="unit" inputdir="${test.unit.src}" exclude="**/pig/*.java" timeout="${test.timeout}">
+ <testmacro inputdir="${test.unit.src}" exclude="**/pig/*.java" timeout="${test.timeout}">
<jvmarg value="-Dlegacy-sstable-root=${test.data}/legacy-sstables"/>
<jvmarg value="-Dinvalid-legacy-sstable-root=${test.data}/invalid-legacy-sstables"/>
<jvmarg value="-Dcorrupt-sstable-root=${test.data}/corrupt-sstables"/>
@@ -1279,7 +1279,7 @@
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}">
+ <testmacro 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="-Dinvalid-legacy-sstable-root=${test.data}/invalid-legacy-sstables"/>
@@ -1305,39 +1305,39 @@
</target>
<target name="msg-ser-gen-test" depends="build-test" description="Generates message serializations">
- <testmacro suitename="unit" inputdir="${test.unit.src}"
+ <testmacro inputdir="${test.unit.src}"
timeout="${test.timeout}" filter="**/SerializationsTest.java">
<jvmarg value="-Dcassandra.test-serialization-writes=True"/>
</testmacro>
</target>
<target name="msg-ser-test" depends="build-test" description="Tests message serializations">
- <testmacro suitename="unit" inputdir="${test.unit.src}" timeout="${test.timeout}"
+ <testmacro inputdir="${test.unit.src}" timeout="${test.timeout}"
filter="**/SerializationsTest.java"/>
</target>
<target name="msg-ser-test-7" depends="build-test" description="Generates message serializations">
- <testmacro suitename="unit" inputdir="${test.unit.src}"
+ <testmacro inputdir="${test.unit.src}"
timeout="${test.timeout}" filter="**/SerializationsTest.java">
<jvmarg value="-Dcassandra.version=0.7"/>
</testmacro>
</target>
<target name="msg-ser-test-10" depends="build-test" description="Tests message serializations on 1.0 messages">
- <testmacro suitename="unit" inputdir="${test.unit.src}"
+ <testmacro inputdir="${test.unit.src}"
timeout="${test.timeout}" filter="**/SerializationsTest.java">
<jvmarg value="-Dcassandra.version=1.0"/>
</testmacro>
</target>
<target name="test-burn" depends="build-test" description="Execute functional tests">
- <testmacro suitename="burn" inputdir="${test.burn.src}"
+ <testmacro inputdir="${test.burn.src}"
timeout="${test.burn.timeout}">
</testmacro>
</target>
<target name="long-test" depends="build-test" description="Execute functional tests">
- <testmacro suitename="long" inputdir="${test.long.src}"
+ <testmacro inputdir="${test.long.src}"
timeout="${test.long.timeout}">
<jvmarg value="-Dcassandra.ring_delay_ms=1000"/>
<jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
@@ -1418,7 +1418,7 @@
</target>
<target name="pig-test" depends="build-test,maven-ant-tasks-retrieve-pig-test" description="Excute Pig tests">
- <testmacro suitename="pig" inputdir="${test.pig.src}"
+ <testmacro inputdir="${test.pig.src}"
timeout="1200000">
</testmacro>
</target>
@@ -1549,7 +1549,6 @@
<!-- Run tests not in parallel and reports errors and generates a junit report after -->
<macrodef name="testmacro">
- <attribute name="suitename" />
<attribute name="inputdir" />
<attribute name="timeout" default="${test.timeout}" />
<attribute name="forkmode" default="perTest"/>
@@ -1561,7 +1560,7 @@
<attribute name="testtag" default=""/>
<sequential>
- <testmacrohelper suitename="@{suitename}" inputdir="@{inputdir}" timeout="@{timeout}"
+ <testmacrohelper inputdir="@{inputdir}" timeout="@{timeout}"
forkmode="@{forkmode}" filter="@{filter}"
exclude="@{exclude}" filelist="@{filelist}" poffset="@{poffset}"
testtag="@{testtag}" >
[2/3] cassandra git commit: Remove usage of suitename that is causing
some tasks to silently fail in cassci
Posted by yu...@apache.org.
Remove usage of suitename that is causing some tasks to silently fail in cassci
Follow up on CASSANDRA-9583
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/947edf1f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/947edf1f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/947edf1f
Branch: refs/heads/trunk
Commit: 947edf1f19a8798b4befd9d598f3e17bbf3d7e48
Parents: 55a736a
Author: Ariel Weisberg <ar...@weisberg.ws>
Authored: Thu Jun 18 16:17:17 2015 -0400
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Jun 18 19:26:16 2015 -0500
----------------------------------------------------------------------
build.xml | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/947edf1f/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 82ec33e..d5e3869 100644
--- a/build.xml
+++ b/build.xml
@@ -1206,7 +1206,7 @@
</target>
<target name="testold" depends="build-test" description="Execute unit tests">
- <testmacro suitename="unit" inputdir="${test.unit.src}" exclude="**/pig/*.java" timeout="${test.timeout}">
+ <testmacro inputdir="${test.unit.src}" exclude="**/pig/*.java" timeout="${test.timeout}">
<jvmarg value="-Dlegacy-sstable-root=${test.data}/legacy-sstables"/>
<jvmarg value="-Dinvalid-legacy-sstable-root=${test.data}/invalid-legacy-sstables"/>
<jvmarg value="-Dcorrupt-sstable-root=${test.data}/corrupt-sstables"/>
@@ -1279,7 +1279,7 @@
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}">
+ <testmacro 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="-Dinvalid-legacy-sstable-root=${test.data}/invalid-legacy-sstables"/>
@@ -1305,39 +1305,39 @@
</target>
<target name="msg-ser-gen-test" depends="build-test" description="Generates message serializations">
- <testmacro suitename="unit" inputdir="${test.unit.src}"
+ <testmacro inputdir="${test.unit.src}"
timeout="${test.timeout}" filter="**/SerializationsTest.java">
<jvmarg value="-Dcassandra.test-serialization-writes=True"/>
</testmacro>
</target>
<target name="msg-ser-test" depends="build-test" description="Tests message serializations">
- <testmacro suitename="unit" inputdir="${test.unit.src}" timeout="${test.timeout}"
+ <testmacro inputdir="${test.unit.src}" timeout="${test.timeout}"
filter="**/SerializationsTest.java"/>
</target>
<target name="msg-ser-test-7" depends="build-test" description="Generates message serializations">
- <testmacro suitename="unit" inputdir="${test.unit.src}"
+ <testmacro inputdir="${test.unit.src}"
timeout="${test.timeout}" filter="**/SerializationsTest.java">
<jvmarg value="-Dcassandra.version=0.7"/>
</testmacro>
</target>
<target name="msg-ser-test-10" depends="build-test" description="Tests message serializations on 1.0 messages">
- <testmacro suitename="unit" inputdir="${test.unit.src}"
+ <testmacro inputdir="${test.unit.src}"
timeout="${test.timeout}" filter="**/SerializationsTest.java">
<jvmarg value="-Dcassandra.version=1.0"/>
</testmacro>
</target>
<target name="test-burn" depends="build-test" description="Execute functional tests">
- <testmacro suitename="burn" inputdir="${test.burn.src}"
+ <testmacro inputdir="${test.burn.src}"
timeout="${test.burn.timeout}">
</testmacro>
</target>
<target name="long-test" depends="build-test" description="Execute functional tests">
- <testmacro suitename="long" inputdir="${test.long.src}"
+ <testmacro inputdir="${test.long.src}"
timeout="${test.long.timeout}">
<jvmarg value="-Dcassandra.ring_delay_ms=1000"/>
<jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
@@ -1418,7 +1418,7 @@
</target>
<target name="pig-test" depends="build-test,maven-ant-tasks-retrieve-pig-test" description="Excute Pig tests">
- <testmacro suitename="pig" inputdir="${test.pig.src}"
+ <testmacro inputdir="${test.pig.src}"
timeout="1200000">
</testmacro>
</target>
@@ -1549,7 +1549,6 @@
<!-- Run tests not in parallel and reports errors and generates a junit report after -->
<macrodef name="testmacro">
- <attribute name="suitename" />
<attribute name="inputdir" />
<attribute name="timeout" default="${test.timeout}" />
<attribute name="forkmode" default="perTest"/>
@@ -1561,7 +1560,7 @@
<attribute name="testtag" default=""/>
<sequential>
- <testmacrohelper suitename="@{suitename}" inputdir="@{inputdir}" timeout="@{timeout}"
+ <testmacrohelper inputdir="@{inputdir}" timeout="@{timeout}"
forkmode="@{forkmode}" filter="@{filter}"
exclude="@{exclude}" filelist="@{filelist}" poffset="@{poffset}"
testtag="@{testtag}" >
[3/3] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Posted by yu...@apache.org.
Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e246ec25
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e246ec25
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e246ec25
Branch: refs/heads/trunk
Commit: e246ec258ccab5cbd648eeb5e04feb5f952c5370
Parents: e14ce11 947edf1
Author: Yuki Morishita <yu...@apache.org>
Authored: Thu Jun 18 19:26:43 2015 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Jun 18 19:26:43 2015 -0500
----------------------------------------------------------------------
build.xml | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e246ec25/build.xml
----------------------------------------------------------------------