Author: kkolinko
Date: Fri Sep 16 17:56:02 2011
New Revision: 1171696
URL: http://svn.apache.org/viewvc?rev=1171696&view=rev
Log:
Merge r1171692
Report tests failure only after all connector variants (BIO,NIO,APR) have been
tested.
- do not stop on first connector that fails.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/build.xml
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 16 17:56:02 2011
@@ -1 +1 @@
-/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447
+/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1171692
Modified: tomcat/tc7.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1171696&r1=1171695&r2=1171696&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/build.xml (original)
+++ tomcat/tc7.0.x/trunk/build.xml Fri Sep 16 17:56:02 2011
@@ -1055,21 +1055,23 @@
<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".' />
+ <fail if="test.result.failure" message='Some tests completed with a
Failure. See ${tomcat.build}/logs for details, search for "FAILED".' />
</target>
- <target name="test-bio" description="Runs the JUnit test cases for BIO"
+ <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" />
</target>
- <target name="test-nio" description="Runs the JUnit test cases for NIO"
+ <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" />
</target>
- <target name="test-apr" description="Runs the JUnit test cases for APR"
+ <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"
@@ -1082,14 +1084,18 @@
</target>
<macrodef name="runtests"
- description="Runs the unit tests using the specified connector" >
+ description="Runs the unit tests using the specified connector.
+ Does not stop on errors, but sets 'test.result.error' and
'test.result.failure' properties.">
<attribute name="protocol"
description="The class name for the connector protocol"/>
<attribute name="extension"
description="The extension to use to distinguish the output"/>
<sequential>
- <junit printsummary="yes" fork="yes" dir="." showoutput="yes">
+ <junit printsummary="yes" fork="yes" dir="." showoutput="yes"
+ errorproperty="test.result.error"
+ failureproperty="test.result.failure"
+ haltonfailure="${test.haltonfailure}" >
<jvmarg value="${test.jvmarg.egd}"/>
<jvmarg value="-Djava.library.path=${test.apr.loc}"/>
@@ -1106,11 +1112,7 @@
<!-- 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"/>
- <batchtest todir="${tomcat.build}/logs"
- unless="test.entry"
- errorproperty="test.result.error"
- failureproperty="test.result.failure"
- haltonfailure="${test.haltonfailure}">
+ <batchtest todir="${tomcat.build}/logs" unless="test.entry">
<fileset dir="test" >
<!-- Include all by default -->
<include name="${test.name}" />
@@ -1121,9 +1123,6 @@
</fileset>
</batchtest>
</junit>
-
- <fail if="test.result.error" message="Some tests completed with an
Error. See ${tomcat.build}/logs for details." />
- <fail if="test.result.failure" message="Some tests completed with a
Failure. See ${tomcat.build}/logs for details." />
</sequential>
</macrodef>
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1171696&r1=1171695&r2=1171696&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri Sep 16 17:56:02 2011
@@ -147,6 +147,12 @@
In jdbc-pool: Discarded connection is not active in a pool any longer.
It removes from the active connection list. (kfujino)
</fix>
+ <update>
+ Update the "test" target in the default build file to report a test
+ failure only after all available connector variants (bio, nio, apr)
+ have been tested. Do not stop after first connector that fails.
+ (kkolinko)
+ </update>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
