You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ma...@apache.org on 2018/12/20 12:47:17 UTC
[3/6] cassandra git commit: move task definition inside testmacro to
not fail build if ant-junit is not installed
move task definition inside testmacro to not fail build if ant-junit is not installed
Patch by marcuse; reviewed by Jon Meredith for CASSANDRA-14915
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/23d722ee
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/23d722ee
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/23d722ee
Branch: refs/heads/trunk
Commit: 23d722ee3a7b91bfe5ee6fe64d090ff247e80438
Parents: 1816520
Author: Marcus Eriksson <ma...@apache.org>
Authored: Thu Nov 29 08:53:19 2018 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Thu Dec 20 13:38:28 2018 +0100
----------------------------------------------------------------------
build.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/23d722ee/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index d7e6c4b..7e85991 100644
--- a/build.xml
+++ b/build.xml
@@ -1130,8 +1130,6 @@
</rat:report>
</target>
- <!-- use https://github.com/krummas/jstackjunit to get thread dumps when unit tests time out -->
- <taskdef name="junit" classname="org.krummas.junit.JStackJUnitTask" classpath="lib/jstackjunit-0.0.1.jar"/>
<target name="build-test" depends="build" description="Compile test classes">
<javac
debug="true"
@@ -1180,10 +1178,12 @@
else="">
<istrue value="${usejacoco}"/>
</condition>
+ <!-- use https://github.com/krummas/jstackjunit to get thread dumps when unit tests time out -->
+ <taskdef name="junit-timeout" classname="org.krummas.junit.JStackJUnitTask" classpath="lib/jstackjunit-0.0.1.jar"/>
<mkdir dir="${build.test.dir}/cassandra"/>
<mkdir dir="${build.test.dir}/output"/>
<mkdir dir="${build.test.dir}/output/@{testtag}"/>
- <junit fork="on" forkmode="@{forkmode}" failureproperty="testfailed" maxmemory="1024m" timeout="@{timeout}">
+ <junit-timeout fork="on" forkmode="@{forkmode}" failureproperty="testfailed" maxmemory="1024m" timeout="@{timeout}">
<formatter classname="org.apache.cassandra.CassandraXMLJUnitResultFormatter" extension=".xml" usefile="true"/>
<formatter classname="org.apache.cassandra.CassandraBriefJUnitResultFormatter" usefile="false"/>
<jvmarg value="-Dstorage-config=${test.conf}"/>
@@ -1215,7 +1215,7 @@
<fileset dir="@{inputdir}" includes="@{filter}" excludes="@{exclude}"/>
<filelist dir="@{inputdir}" files="@{filelist}"/>
</batchtest>
- </junit>
+ </junit-timeout>
<delete quiet="true" failonerror="false" dir="${build.test.dir}/cassandra/commitlog:@{poffset}"/>
<delete quiet="true" failonerror="false" dir="${build.test.dir}/cassandra/data:@{poffset}"/>
<delete quiet="true" failonerror="false" dir="${build.test.dir}/cassandra/saved_caches:@{poffset}"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org