Author: eevans
Date: Wed Dec 8 16:39:46 2010
New Revision: 1043506
URL: http://svn.apache.org/viewvc?rev=1043506&view=rev
Log:
tunable testsuite timeouts
Hudson runs the tests instrumented by Cobertura, which seems to slow
things down quite a bit. The build hosts themselves are also likey
subject to more load than we typically see, further stretching the
test runs.
This change allows overriding the timeouts with -Dtest.timeout and
-Dtest.long.timeout for the short and long tests respectively. These
options shouldn't be needed in typical use.
Modified:
cassandra/trunk/build.xml
Modified: cassandra/trunk/build.xml
URL:
http://svn.apache.org/viewvc/cassandra/trunk/build.xml?rev=1043506&r1=1043505&r2=1043506&view=diff
==============================================================================
--- cassandra/trunk/build.xml (original)
+++ cassandra/trunk/build.xml Wed Dec 8 16:39:46 2010
@@ -57,6 +57,8 @@
<property name="ivy.version" value="2.1.0" />
<property name="ivy.url"
value="http://repo2.maven.org/maven2/org/apache/ivy/ivy"; />
+ <property name="test.timeout" value="60000" />
+ <property name="test.long.timeout" value="300000" />
<!-- http://cobertura.sourceforge.net/ -->
<property name="cobertura.build.dir" value="${build.dir}/cobertura"/>
@@ -474,11 +476,13 @@
</macrodef>
<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}" />
</target>
<target name="long-test" depends="build-test" description="Execute
functional tests">
- <testmacro suitename="long" inputdir="${test.long.src}" timeout="300000" />
+ <testmacro suitename="long" inputdir="${test.long.src}"
+ timeout="${test.long.timeout}" />
</target>
<!-- instruments the classes to later create code coverage reports -->
