Author: markt
Date: Wed Nov 30 20:53:03 2011
New Revision: 1208772
URL: http://svn.apache.org/viewvc?rev=1208772&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52237
Allow configuration of junit log output format. Defaults unchanged.
Patch provided by M Hasko
Modified:
tomcat/trunk/build.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1208772&r1=1208771&r2=1208772&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Wed Nov 30 20:53:03 2011
@@ -1067,6 +1067,10 @@
</javac>
</target>
+ <!-- Default JUnit formatter log output -->
+ <property name="junit.formatter.type" value="plain"/>
+ <property name="junit.formatter.extension" value=".txt"/>
+
<target name="test" description="Runs the JUnit test cases"
depends="test-bio,test-nio,test-apr" >
<fail if="test.result.error" message='Some tests completed with an Error.
See ${tomcat.build}/logs for details, search for "FAILED".' />
@@ -1076,20 +1080,20 @@
<target name="test-bio" description="Runs the JUnit test cases for BIO. Does
not stop on errors."
depends="test-compile,deploy" if="${execute.test.bio}">
<runtests protocol="org.apache.coyote.http11.Http11Protocol"
- extension=".BIO.txt" />
+ extension=".BIO" />
</target>
<target name="test-nio" description="Runs the JUnit test cases for NIO. Does
not stop on errors."
depends="test-compile,deploy" if="${execute.test.nio}">
<runtests protocol="org.apache.coyote.http11.Http11NioProtocol"
- extension=".NIO.txt" />
+ extension=".NIO" />
</target>
<target name="test-apr" description="Runs the JUnit test cases for APR. Does
not stop on errors."
depends="test-compile,deploy,test-apr-exists"
if="${apr.exists}">
<runtests protocol="org.apache.coyote.http11.Http11AprProtocol"
- extension=".APR.txt" />
+ extension=".APR" />
</target>
<target name="test-apr-exists" description="Checks for APR lib"
@@ -1122,7 +1126,7 @@
<sysproperty key="tomcat.test.protocol" value="@{protocol}" />
<sysproperty key="tomcat.test.accesslog" value="${test.accesslog}" />
- <formatter type="plain" usefile="true" extension="@{extension}"/>
+ <formatter type="${junit.formatter.type}" usefile="true"
extension="@{extension}${junit.formatter.extension}"/>
<!-- If test.entry is defined, run a single test, otherwise run all
valid tests -->
<test todir="${tomcat.build}/logs" name="${test.entry}"
if="test.entry"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
