brett 2004/04/24 19:24:36
Modified: test plugin.jelly plugin.properties
test/xdocs changes.xml properties.xml
Log:
PR: MPTEST-27
Submitted by: joseph benavidez
allow specification of <env/> vars
Revision Changes Path
1.30 +16 -0 maven-plugins/test/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/test/plugin.jelly,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- plugin.jelly 21 Apr 2004 01:06:51 -0000 1.29
+++ plugin.jelly 25 Apr 2004 02:24:36 -0000 1.30
@@ -121,6 +121,10 @@
<j:forEach var="someProperty" items="${listOfProperties}">
<sysproperty key="${someProperty}"
value="${context.getVariable(someProperty)}"/>
</j:forEach>
+ <u:tokenize var="listOfEnv" delim=" ">${maven.junit.envvars}</u:tokenize>
+ <j:forEach var="someEnv" items="${listOfEnv}">
+ <env key="${someEnv}" value="${context.getVariable(someEnv)}"/>
+ </j:forEach>
<u:tokenize var="listOfJvmArgs" delim="
">${maven.junit.jvmargs}</u:tokenize>
<j:forEach var="somejvmarg" items="${listOfJvmArgs}">
<jvmarg value="${somejvmarg}"/>
@@ -173,6 +177,10 @@
<j:forEach var="someProperty" items="${listOfProperties}">
<sysproperty key="${someProperty}"
value="${context.getVariable(someProperty)}"/>
</j:forEach>
+ <u:tokenize var="listOfEnv" delim=" ">${maven.junit.envvars}</u:tokenize>
+ <j:forEach var="someEnv" items="${listOfEnv}">
+ <env key="${someEnv}" value="${context.getVariable(someEnv)}"/>
+ </j:forEach>
<u:tokenize var="listOfJvmArgs" delim=" ">${maven.junit.jvmargs}</u:tokenize>
<j:forEach var="somejvmarg" items="${listOfJvmArgs}">
<jvmarg value="${somejvmarg}"/>
@@ -225,6 +233,10 @@
<j:forEach var="someProperty" items="${listOfProperties}">
<sysproperty key="${someProperty}"
value="${context.getVariable(someProperty)}"/>
</j:forEach>
+ <u:tokenize var="listOfEnv" delim="
">${maven.junit.envvars}</u:tokenize>
+ <j:forEach var="someEnv" items="${listOfEnv}">
+ <env key="${someEnv}" value="${context.getVariable(someEnv)}"/>
+ </j:forEach>
<u:tokenize var="listOfJvmArgs" delim="
">${maven.junit.jvmargs}</u:tokenize>
<j:forEach var="somejvmarg" items="${listOfJvmArgs}">
<jvmarg value="${somejvmarg}"/>
@@ -297,6 +309,10 @@
<u:tokenize var="listOfProperties" delim="
">${maven.junit.sysproperties}</u:tokenize>
<j:forEach var="someProperty" items="${listOfProperties}">
<sysproperty key="${someProperty}"
value="${context.getVariable(someProperty)}"/>
+ </j:forEach>
+ <u:tokenize var="listOfEnv" delim="
">${maven.junit.envvars}</u:tokenize>
+ <j:forEach var="someEnv" items="${listOfEnv}">
+ <env key="${someEnv}" value="${context.getVariable(someEnv)}"/>
</j:forEach>
<maven:pluginVar var="jvmargs" plugin="maven-test-plugin"
property="maven.junit.jvmargs" />
<j:if test="${!empty(jvmArgs)}">
1.10 +1 -0 maven-plugins/test/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/maven-plugins/test/plugin.properties,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- plugin.properties 21 Apr 2004 01:06:51 -0000 1.9
+++ plugin.properties 25 Apr 2004 02:24:36 -0000 1.10
@@ -24,6 +24,7 @@
maven.junit.fork = no
maven.junit.format=brief
maven.junit.jvmargs=
+maven.junit.envvars=
maven.junit.jvm=
maven.junit.printSummary=true
maven.junit.usefile = true
1.14 +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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- changes.xml 21 Apr 2004 01:06:52 -0000 1.13
+++ changes.xml 25 Apr 2004 02:24:36 -0000 1.14
@@ -25,6 +25,7 @@
</properties>
<body>
<release version="1.6-SNAPSHOT" date="in CVS">
+ <action dev="brett" type="fix" issue="MPTEST-27" due-to="joseph
benavidez">add maven.junit.envvars property</action>
<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>
1.12 +16 -2 maven-plugins/test/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/maven-plugins/test/xdocs/properties.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- properties.xml 21 Apr 2004 01:06:52 -0000 1.11
+++ properties.xml 25 Apr 2004 02:24:36 -0000 1.12
@@ -195,11 +195,25 @@
<td>Yes</td>
<td>
If fork is enabled, additional parameters may be passed to the new VM.
- You can specify some args separate by space.
- Each arg is describe in sub properties.
+ You can specify some args separated by a space.
Sample :
<source><![CDATA[
maven.junit.jvmargs=-Xmx160m -verbose
+ ]]>
+ </source>
+ </td>
+ </tr>
+ <tr>
+ <td>maven.junit.envvars</td>
+ <td>Yes</td>
+ <td>
+ If fork is enabled, additional environment variables may be passed to
the new VM.
+ You can specify some variable separated by a space.
+ Each variable is describe in sub properties.
+ Sample :
+ <source><![CDATA[
+maven.junit.envvars=LD_LIBRARY_PATH
+LD_LIBRARY_PATH=/usr/local/lib
]]>
</source>
</td>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
