Updated Branches: refs/heads/trunk 016a2b052 -> 944c01517
unify test timeouts, exclude pig Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/944c0151 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/944c0151 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/944c0151 Branch: refs/heads/trunk Commit: 944c015175c3234bd7bbf1ee9900db8a0d0e7064 Parents: 3d64d3a Author: Brandon Williams <[email protected]> Authored: Fri Jan 31 12:20:18 2014 -0600 Committer: Sylvain Lebresne <[email protected]> Committed: Fri Jan 31 22:11:01 2014 +0100 ---------------------------------------------------------------------- build.xml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/944c0151/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index a033874..032cc71 100644 --- a/build.xml +++ b/build.xml @@ -1109,17 +1109,20 @@ </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> + <fileset dir="${test.unit.src}"> + <exclude name="**/pig/*.java" /> + </fileset> </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"/> @@ -1127,30 +1130,33 @@ <jvmarg value="-Dcassandra.ring_delay_ms=1000"/> <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/> </testmacro> + <fileset dir="${test.unit.src}"> + <exclude name="**/pig/*.java" /> + </fileset> </target> <target name="msg-ser-gen-test" depends="build-test" description="Generates message serializations"> <testmacro suitename="unit" inputdir="${test.unit.src}" - timeout="60000" filter="**/SerializationsTest.java"> + 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="60000" + <testmacro suitename="unit" 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}" - timeout="60000" filter="**/SerializationsTest.java"> + 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}" - timeout="60000" filter="**/SerializationsTest.java"> + timeout="${test.timeout}" filter="**/SerializationsTest.java"> <jvmarg value="-Dcassandra.version=1.0"/> </testmacro> </target>
