From 878e4510a41d971f1f5018769cf2279c27871a63 Mon Sep 17 00:00:00 2001
From: ltheussl <ltheussl@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 23 Mar 2006 19:47:24 +0000
Subject: [PATCH] PR: MPTEST-58 Add ability to fail the build on test errors,
 new property maven.test.error.ignore.

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

diff --git a/test/plugin.jelly b/test/plugin.jelly
index 4bee25a7..89310b3b 100644
--- a/test/plugin.jelly
+++ b/test/plugin.jelly
@@ -134,8 +134,14 @@
         <j:set var="_haltonfailure" value="yes"/>
       </j:if>
 
-      <junit printSummary="${maven.junit.printSummary}" 
+      <j:set var="_haltonerror" value="no"/>
+      <j:if test="${context.getVariable('maven.test.error.ignore') != 'true'}">
+        <j:set var="_haltonerror" value="yes"/>
+      </j:if>
+
+      <junit printSummary="${maven.junit.printSummary}"
              haltonfailure="${_haltonfailure}"
+             haltonerror="${_haltonerror}"
              fork="${maven.junit.fork}"
              forkmode="${maven.junit.forkmode}">
 
@@ -257,8 +263,14 @@
             <j:set var="_haltonfailure" value="yes"/>
           </j:if>
 
+          <j:set var="_haltonerror" value="no"/>
+          <j:if test="${context.getVariable('maven.test.error.ignore') != 'true'}">
+            <j:set var="_haltonerror" value="yes"/>
+          </j:if>
+
           <junit printSummary="${maven.junit.printSummary}"
                  haltonfailure="${_haltonfailure}"
+                 haltonerror="${_haltonerror}"
                  fork="${maven.junit.fork}"
                  dir="${maven.junit.dir}"
                  forkmode="${maven.junit.forkmode}">
@@ -341,8 +353,14 @@
            <j:set var="_haltonfailure" value="yes"/>
          </j:if>
 
+          <j:set var="_haltonerror" value="no"/>
+          <j:if test="${context.getVariable('maven.test.error.ignore') != 'true'}">
+            <j:set var="_haltonerror" value="yes"/>
+          </j:if>
+
           <junit printSummary="${maven.junit.printSummary}"
                  haltonfailure="${_haltonfailure}"
+                 haltonerror="${_haltonerror}"
                  fork="${maven.junit.fork}"
                  dir="${maven.junit.dir}"
                  forkmode="${maven.junit.forkmode}">
diff --git a/test/xdocs/changes.xml b/test/xdocs/changes.xml
index 3ba45303..a444302c 100644
--- a/test/xdocs/changes.xml
+++ b/test/xdocs/changes.xml
@@ -24,6 +24,7 @@
   </properties>
   <body>
     <release version="1.8-SNAPSHOT" date="in SVN">
+      <action dev="ltheussl" type="add" issue="MPTEST-58" due-to="Mauro Botelho">Add ability to fail the build on test errors, new property <code>maven.test.error.ignore</code>.</action>
       <action dev="ltheussl" type="fix" issue="MPTEST-46">Do not execute <code>test:test-resources</code> and <code>test:compile</code> unless tests will be run.</action>
       <action dev="ltheussl" type="fix" issue="MPTEST-59"><code>test:single</code> should ignore <code>maven.test.skip=true</code>.</action>
       <action dev="ltheussl" type="fix" issue="MPTEST-39">Test failure doesn't halt execution of test suite.</action>
diff --git a/test/xdocs/properties.xml b/test/xdocs/properties.xml
index 18be9ad3..d84e0f17 100644
--- a/test/xdocs/properties.xml
+++ b/test/xdocs/properties.xml
@@ -121,7 +121,16 @@
           <td>maven.test.failure.ignore</td>
           <td>Yes</td>
           <td>
-            Set this to <code>true</code> to ignore a failure during testing.
+            Set this to <code>true</code> to ignore a failure during testing
+            (errors are considered failures as well).
+            Its use is <b>NOT RECOMMENDED</b>, but quite convenient on occasion.
+          </td>
+        </tr>
+        <tr>
+          <td>maven.test.error.ignore</td>
+          <td>Yes</td>
+          <td>
+            Set this to <code>true</code> to ignore errors during testing.
             Its use is <b>NOT RECOMMENDED</b>, but quite convenient on occasion.
           </td>
         </tr>