Author: ltheussl
Date: Thu Mar 23 11:47:24 2006
New Revision: 388247

URL: http://svn.apache.org/viewcvs?rev=388247&view=rev
Log:
PR: MPTEST-58
Add ability to fail the build on test errors,
new property maven.test.error.ignore.

Modified:
    maven/maven-1/plugins/trunk/test/plugin.jelly
    maven/maven-1/plugins/trunk/test/xdocs/changes.xml
    maven/maven-1/plugins/trunk/test/xdocs/properties.xml

Modified: maven/maven-1/plugins/trunk/test/plugin.jelly
URL: 
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/test/plugin.jelly?rev=388247&r1=388246&r2=388247&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/test/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/test/plugin.jelly Thu Mar 23 11:47:24 2006
@@ -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}">

Modified: maven/maven-1/plugins/trunk/test/xdocs/changes.xml
URL: 
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/test/xdocs/changes.xml?rev=388247&r1=388246&r2=388247&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/test/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/test/xdocs/changes.xml Thu Mar 23 11:47:24 2006
@@ -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>

Modified: maven/maven-1/plugins/trunk/test/xdocs/properties.xml
URL: 
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/test/xdocs/properties.xml?rev=388247&r1=388246&r2=388247&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/test/xdocs/properties.xml (original)
+++ maven/maven-1/plugins/trunk/test/xdocs/properties.xml Thu Mar 23 11:47:24 
2006
@@ -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>


Reply via email to