From 956177e46325d50d0250d96886f3d8d738e6277a Mon Sep 17 00:00:00 2001
From: brett <brett@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 12 Apr 2004 22:50:15 +0000
Subject: [PATCH] PR: MPTEST-25 honour maven.test.ignore.failure in test:match
 and test:single

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115004 13f79535-47bb-0310-9956-ffa450edef68
---
 test/plugin.jelly      | 19 +++++++++++++++----
 test/xdocs/changes.xml |  3 +++
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/test/plugin.jelly b/test/plugin.jelly
index 76127454..c476154a 100644
--- a/test/plugin.jelly
+++ b/test/plugin.jelly
@@ -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>
diff --git a/test/xdocs/changes.xml b/test/xdocs/changes.xml
index df5f9f5a..d7e53ab3 100644
--- a/test/xdocs/changes.xml
+++ b/test/xdocs/changes.xml
@@ -24,6 +24,9 @@
     <author email="dion@multitask.com.au">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>