natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-2.1' into trunk

This commit is contained in:
Sylvain Lebresne 2014-07-01 15:41:26 +02:00
parent 36640fcac9 277475837f
commit 5b7798cd5e
1 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
build.xml
View File

@ -1117,7 +1117,7 @@
</classpath> </classpath>
<batchtest todir="${build.test.dir}/output"> <batchtest todir="${build.test.dir}/output">
<fileset dir="@{inputdir}" includes="@{filter}" excludes="@{exclude}"/> <fileset dir="@{inputdir}" includes="@{filter}" excludes="@{exclude}"/>
<filelist dir="@{inputdir}" files="@{filelist}"/> <filelist dir="@{inputdir}" files="@{filelist}"/>
</batchtest> </batchtest>
</junit> </junit>
<fail message="Some @{suitename} test(s) failed."> <fail message="Some @{suitename} test(s) failed.">
@ -1256,10 +1256,45 @@
</target> </target>
<target name="cql-test" depends="build-test" description="Execute CQL tests"> <target name="cql-test" depends="build-test" description="Execute CQL tests">
<testmacro suitename="cql" inputdir="${test.unit.src}" <sequential>
timeout="${test.timeout}" filter="**/cql3/*Test.java" <echo message="running CQL tests"/>
forkmode="once"> <mkdir dir="${build.test.dir}/cassandra"/>
</testmacro> <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>
<target name="cql-test-some" depends="build-test" description="Execute specific CQL tests" > <target name="cql-test-some" depends="build-test" description="Execute specific CQL tests" >