brett 2004/04/12 15:50:15
Modified: test plugin.jelly
test/xdocs changes.xml
Log:
PR: MPTEST-25
honour maven.test.ignore.failure in test:match and test:single
Revision Changes Path
1.27 +15 -4 maven-plugins/test/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/test/plugin.jelly,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- plugin.jelly 8 Apr 2004 00:54:56 -0000 1.26
+++ plugin.jelly 12 Apr 2004 22:50:14 -0000 1.27
@@ -211,8 +211,7 @@
/>
<junit printSummary="${maven.junit.printSummary}"
- haltonfailure="yes"
- haltonerror="yes"
+ failureProperty="maven.test.failure"
fork="${maven.junit.fork}"
dir="${maven.junit.dir}">
@@ -241,6 +240,13 @@
</junit>
+ <j:if test="${maven.test.failure}">
+ <j:set var="ignore__" value="${maven.test.failure.ignore}X"/>
+ <j:if test="${ignore__ == 'X'}">
+ <fail message="There were test failures."/>
+ </j:if>
+ </j:if>
+
</j:otherwise>
</j:choose>
</j:if>
@@ -276,8 +282,7 @@
<echo>Searching directory ${maven.test.searchdir}</echo>
<junit printSummary="${maven.junit.printSummary}"
- haltonfailure="yes"
- haltonerror="yes"
+ failureProperty="maven.test.failure"
fork="${maven.junit.fork}"
dir="${maven.junit.dir}">
@@ -310,6 +315,12 @@
</junit>
+ <j:if test="${maven.test.failure}">
+ <j:set var="ignore__" value="${maven.test.failure.ignore}X"/>
+ <j:if test="${ignore__ == 'X'}">
+ <fail message="There were test failures."/>
+ </j:if>
+ </j:if>
</j:otherwise>
</j:choose>
</j:if>
1.11 +3 -0 maven-plugins/test/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/test/xdocs/changes.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- changes.xml 7 Mar 2004 01:21:41 -0000 1.10
+++ changes.xml 12 Apr 2004 22:50:15 -0000 1.11
@@ -24,6 +24,9 @@
<author email="[EMAIL PROTECTED]">dIon Gillard</author>
</properties>
<body>
+ <release version="1.6-SNAPSHOT" date="in CVS">
+ <action dev="brett" type="fix" issue="MPTEST-25">Honour
maven.test.failure.ignore for test:single and test:match</action>
+ </release>
<release version="1.5" date="2004-03-07">
<action dev="brett" type="fix">Honour maven.test.skip for other test goals,
such as compile</action>
<action dev="dion" type="add">Added maven.junit.format property that defaults
to brief. Changed formatters to use maven.junit.usefile consistently. Only set 'dir'
property of junit task if fork != 'no'</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
