Author: ltheussl
Date: Fri Mar 24 09:30:12 2006
New Revision: 388584
URL: http://svn.apache.org/viewcvs?rev=388584&view=rev
Log:
PR: MPTEST-10
Add timeouts to the test plugin, new property maven.junit.timeout.
Modified:
maven/maven-1/plugins/trunk/test/plugin.jelly
maven/maven-1/plugins/trunk/test/plugin.properties
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=388584&r1=388583&r2=388584&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/test/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/test/plugin.jelly Fri Mar 24 09:30:12 2006
@@ -148,6 +148,9 @@
<j:if test="${context.getVariable('maven.junit.jvm') != null}">
<setProperty name="jvm" value="${maven.junit.jvm}" />
</j:if>
+ <j:if test="${context.getVariable('maven.junit.timeout') != null}">
+ <setProperty name="timeout" value="${maven.junit.timeout}" />
+ </j:if>
<j:if
test="${!context.getVariable('maven.junit.fork').toString().trim().equalsIgnoreCase('no')}">
<setProperty name="dir" value="${maven.junit.dir}" />
</j:if>
@@ -278,6 +281,9 @@
<j:if test="${context.getVariable('maven.junit.jvm') != null}">
<setProperty name="jvm" value="${maven.junit.jvm}" />
</j:if>
+ <j:if test="${context.getVariable('maven.junit.timeout') != null}">
+ <setProperty name="timeout" value="${maven.junit.timeout}" />
+ </j:if>
<sysproperty key="basedir" value="${basedir}"/>
<u:tokenize var="listOfProperties" delim="
">${maven.junit.sysproperties}</u:tokenize>
<j:forEach var="someProperty" items="${listOfProperties}">
@@ -367,6 +373,9 @@
<j:if test="${context.getVariable('maven.junit.jvm') != null}">
<setProperty name="jvm" value="${maven.junit.jvm}" />
+ </j:if>
+ <j:if test="${context.getVariable('maven.junit.timeout') != null}">
+ <setProperty name="timeout" value="${maven.junit.timeout}" />
</j:if>
<sysproperty key="basedir" value="${basedir}"/>
<u:tokenize var="listOfProperties" delim="
">${maven.junit.sysproperties}</u:tokenize>
Modified: maven/maven-1/plugins/trunk/test/plugin.properties
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/test/plugin.properties?rev=388584&r1=388583&r2=388584&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/test/plugin.properties (original)
+++ maven/maven-1/plugins/trunk/test/plugin.properties Fri Mar 24 09:30:12 2006
@@ -27,6 +27,7 @@
maven.junit.jvmargs=
maven.junit.envvars=
maven.junit.jvm=
+#maven.junit.timeout=
maven.junit.printSummary=true
maven.junit.usefile = true
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=388584&r1=388583&r2=388584&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/test/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/test/xdocs/changes.xml Fri Mar 24 09:30:12 2006
@@ -24,6 +24,7 @@
</properties>
<body>
<release version="1.8-SNAPSHOT" date="in SVN">
+ <action dev="ltheussl" type="add" issue="MPTEST-10">Add timeouts to the
test plugin, new property <code>maven.junit.timeout</code>.</action>
<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>
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=388584&r1=388583&r2=388584&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/test/xdocs/properties.xml (original)
+++ maven/maven-1/plugins/trunk/test/xdocs/properties.xml Fri Mar 24 09:30:12
2006
@@ -99,6 +99,14 @@
</td>
</tr>
<tr>
+ <td>maven.junit.timeout</td>
+ <td>Yes</td>
+ <td>
+ Cancel the individual tests if they don't finish in the given time
+ (measured in milliseconds). Ignored if fork is disabled.
+ </td>
+ </tr>
+ <tr>
<td>maven.test.dest</td>
<td>Yes</td>
<td>
