You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2014/07/01 15:41:33 UTC
[1/4] git commit: Make sure cql-test only run CQLTester ones
Repository: cassandra
Updated Branches:
refs/heads/trunk 36640fcac -> 5b7798cd5
Make sure cql-test only run CQLTester ones
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fcd3cc0e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fcd3cc0e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fcd3cc0e
Branch: refs/heads/trunk
Commit: fcd3cc0eb6a1104d6237a6d8eca772b0358b1bac
Parents: 0bbfabb
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Jul 1 15:38:51 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Jul 1 15:38:51 2014 +0200
----------------------------------------------------------------------
build.xml | 45 ++++++++++++++++++++++++++++++++++++++++-----
1 file changed, 40 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fcd3cc0e/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index c34bcfc..daf0516 100644
--- a/build.xml
+++ b/build.xml
@@ -1096,7 +1096,7 @@
</classpath>
<batchtest todir="${build.test.dir}/output">
<fileset dir="@{inputdir}" includes="@{filter}" excludes="@{exclude}"/>
- <filelist dir="@{inputdir}" files="@{filelist}"/>
+ <filelist dir="@{inputdir}" files="@{filelist}"/>
</batchtest>
</junit>
<fail message="Some @{suitename} test(s) failed.">
@@ -1223,10 +1223,45 @@
</target>
<target name="cql-test" depends="build-test" description="Execute CQL tests">
- <testmacro suitename="cql" inputdir="${test.unit.src}"
- timeout="${test.timeout}" filter="**/cql3/*Test.java"
- forkmode="once">
- </testmacro>
+ <sequential>
+ <echo message="running CQL tests"/>
+ <mkdir dir="${build.test.dir}/cassandra"/>
+ <mkdir dir="${build.test.dir}/output"/>
+ <junit fork="on" forkmode="once" failureproperty="testfailed" maxmemory="1024m" timeout="${test.timeout}">
+ <formatter type="brief" usefile="false"/>
+ <jvmarg value="-Dstorage-config=${test.conf}"/>
+ <jvmarg value="-Djava.awt.headless=true"/>
+ <jvmarg value="-javaagent:${basedir}/lib/jamm-0.2.6.jar" />
+ <jvmarg value="-ea"/>
+ <jvmarg value="-Xss256k"/>
+ <jvmarg value="-Dcassandra.memtable_row_overhead_computation_step=100"/>
+ <jvmarg value="-Dcassandra.test.use_prepared=${cassandra.test.use_prepared}"/>
+ <classpath>
+ <path refid="cassandra.classpath" />
+ <pathelement location="${test.classes}"/>
+ <path refid="cobertura.classpath"/>
+ <pathelement location="${test.conf}"/>
+ <fileset dir="${test.lib}">
+ <include name="**/*.jar" />
+ </fileset>
+ </classpath>
+ <batchtest todir="${build.test.dir}/output">
+ <fileset dir="${test.unit.src}" includes="**/cql3/*Test.java">
+ <contains text="CQLTester" casesensitive="yes"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ <fail message="Some CQL test(s) failed.">
+ <condition>
+ <and>
+ <isset property="testfailed"/>
+ <not>
+ <isset property="ant.test.failure.ignore"/>
+ </not>
+ </and>
+ </condition>
+ </fail>
+ </sequential>
</target>
<target name="cql-test-some" depends="build-test" description="Execute specific CQL tests" >
[2/4] git commit: Merge branch 'cassandra-2.1.0' of
https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-2.1.0
Posted by sl...@apache.org.
Merge branch 'cassandra-2.1.0' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-2.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/39925d24
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/39925d24
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/39925d24
Branch: refs/heads/trunk
Commit: 39925d24876e6c49f2f7aebf9240201690c4f55f
Parents: fcd3cc0 c23eccf
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Jul 1 15:39:10 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Jul 1 15:39:10 2014 +0200
----------------------------------------------------------------------
CHANGES.txt | 3 +++
lib/snappy-java-1.0.5.1.jar | Bin 1280090 -> 0 bytes
lib/snappy-java-1.0.5.2.jar | Bin 0 -> 1339383 bytes
3 files changed, 3 insertions(+)
----------------------------------------------------------------------
[4/4] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by sl...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5b7798cd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5b7798cd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5b7798cd
Branch: refs/heads/trunk
Commit: 5b7798cd5e98450ed0baae6284cbf22e66f00fc6
Parents: 36640fc 2774758
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Jul 1 15:41:26 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Jul 1 15:41:26 2014 +0200
----------------------------------------------------------------------
build.xml | 45 ++++++++++++++++++++++++++++++++++++++++-----
1 file changed, 40 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b7798cd/build.xml
----------------------------------------------------------------------
[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Posted by sl...@apache.org.
Merge branch 'cassandra-2.1.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/27747583
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/27747583
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/27747583
Branch: refs/heads/trunk
Commit: 277475837f0906e6091b2e798afc4e7610846ed1
Parents: ba3a1ba 39925d2
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Jul 1 15:40:20 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Jul 1 15:40:20 2014 +0200
----------------------------------------------------------------------
build.xml | 45 ++++++++++++++++++++++++++++++++++++++++-----
1 file changed, 40 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/27747583/build.xml
----------------------------------------------------------------------