PR: MPTEST-26

add maven.junit.jvm property


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115031 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
brett
2004-04-21 01:06:52 +00:00
parent d0e562c3f6
commit b4916b5b9d
5 changed files with 21 additions and 2 deletions

View File

@@ -110,6 +110,9 @@
<junit printSummary="${maven.junit.printSummary}"
failureProperty="maven.test.failure"
fork="${maven.junit.fork}">
<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.fork').toString().trim().equalsIgnoreCase('no')}">
<setProperty name="dir" value="${maven.junit.dir}" />
</j:if>
@@ -214,6 +217,9 @@
fork="${maven.junit.fork}"
dir="${maven.junit.dir}">
<j:if test="${context.getVariable('maven.junit.jvm') != null}">
<setProperty name="jvm" value="${maven.junit.jvm}" />
</j:if>
<sysproperty key="basedir" value="${basedir}"/>
<u:tokenize var="listOfProperties" delim=" ">${maven.junit.sysproperties}</u:tokenize>
<j:forEach var="someProperty" items="${listOfProperties}">
@@ -277,13 +283,16 @@
classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"
/>
<echo>Searching directory ${maven.test.searchdir}</echo>
<echo>Searching directory ${maven.test.searchdir}</echo>
<junit printSummary="${maven.junit.printSummary}"
failureProperty="maven.test.failure"
fork="${maven.junit.fork}"
dir="${maven.junit.dir}">
<j:if test="${context.getVariable('maven.junit.jvm') != null}">
<setProperty name="jvm" value="${maven.junit.jvm}" />
</j:if>
<sysproperty key="basedir" value="${basedir}"/>
<u:tokenize var="listOfProperties" delim=" ">${maven.junit.sysproperties}</u:tokenize>
<j:forEach var="someProperty" items="${listOfProperties}">

View File

@@ -24,6 +24,7 @@ maven.junit.dir = ${basedir}
maven.junit.fork = no
maven.junit.format=brief
maven.junit.jvmargs=
maven.junit.jvm=
maven.junit.printSummary=true
maven.junit.usefile = true

View File

@@ -20,4 +20,3 @@
maven.xdoc.date=left
## maven.xdoc.version=${pom.currentVersion}
maven.license.licenseFile=${basedir}/../../../LICENSE.txt

View File

@@ -25,6 +25,7 @@
</properties>
<body>
<release version="1.6-SNAPSHOT" date="in CVS">
<action dev="brett" type="fix" issue="MPTEST-26">add maven.junit.jvm property</action>
<action dev="brett" type="fix" issue="MPTEST-28">accept maven.test.failure.ignore == false</action>
<action dev="brett" type="fix" issue="MPTEST-25">Honour maven.test.failure.ignore for test:single and test:match</action>
</release>

View File

@@ -73,6 +73,15 @@
task <code>printSummary</code> attribute.
</td>
</tr>
<tr>
<td>maven.junit.jvm</td>
<td>Yes</td>
<td>
If this property is set it is used as the JVM for the junit tests
to run in. This is passed to the Ant junit task in the jvm property.
If maven.junit.fork is not true, this is ignored.
</td>
</tr>
<tr>
<td>maven.test.dest</td>
<td>Yes</td>