You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2004/04/21 03:06:52 UTC
cvs commit: maven-plugins/test/xdocs changes.xml properties.xml
brett 2004/04/20 18:06:52
Modified: test plugin.jelly plugin.properties project.properties
test/xdocs changes.xml properties.xml
Log:
PR: MPTEST-26
add maven.junit.jvm property
Revision Changes Path
1.29 +10 -1 maven-plugins/test/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/test/plugin.jelly,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- plugin.jelly 15 Apr 2004 06:09:50 -0000 1.28
+++ plugin.jelly 21 Apr 2004 01:06:51 -0000 1.29
@@ -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}">
1.9 +1 -0 maven-plugins/test/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/maven-plugins/test/plugin.properties,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- plugin.properties 4 Mar 2004 18:39:12 -0000 1.8
+++ plugin.properties 21 Apr 2004 01:06:51 -0000 1.9
@@ -24,6 +24,7 @@
maven.junit.fork = no
maven.junit.format=brief
maven.junit.jvmargs=
+maven.junit.jvm=
maven.junit.printSummary=true
maven.junit.usefile = true
1.5 +0 -1 maven-plugins/test/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/maven-plugins/test/project.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.properties 4 Mar 2004 18:39:12 -0000 1.4
+++ project.properties 21 Apr 2004 01:06:51 -0000 1.5
@@ -20,4 +20,3 @@
maven.xdoc.date=left
## maven.xdoc.version=${pom.currentVersion}
maven.license.licenseFile=${basedir}/../../../LICENSE.txt
-
1.13 +1 -0 maven-plugins/test/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/test/xdocs/changes.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- changes.xml 15 Apr 2004 06:09:50 -0000 1.12
+++ changes.xml 21 Apr 2004 01:06:52 -0000 1.13
@@ -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>
1.11 +9 -0 maven-plugins/test/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/maven-plugins/test/xdocs/properties.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- properties.xml 4 Mar 2004 18:39:12 -0000 1.10
+++ properties.xml 21 Apr 2004 01:06:52 -0000 1.11
@@ -74,6 +74,15 @@
</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>
<td>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org