Repository: cassandra Updated Branches: refs/heads/cassandra-2.1.0 c23eccf3c -> 39925d248
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/cassandra-2.1.0 Commit: fcd3cc0eb6a1104d6237a6d8eca772b0358b1bac Parents: 0bbfabb Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue Jul 1 15:38:51 2014 +0200 Committer: Sylvain Lebresne <sylv...@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" >
