Bommels05/maven-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PR: MPTEST-27

Browse Source 
Submitted by: joseph benavidez
allow specification of <env/> vars


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115042 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
brett 2004-04-25 02:24:36 +00:00
parent f59f9e27c4
commit c81c867f22
4 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
test/plugin.jelly
View File

@ -121,6 +121,10 @@
<j:forEach var="someProperty" items="${listOfProperties}"> <j:forEach var="someProperty" items="${listOfProperties}">
<sysproperty key="${someProperty}" value="${context.getVariable(someProperty)}"/> <sysproperty key="${someProperty}" value="${context.getVariable(someProperty)}"/>
</j:forEach> </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> <u:tokenize var="listOfJvmArgs" delim=" ">${maven.junit.jvmargs}</u:tokenize>
<j:forEach var="somejvmarg" items="${listOfJvmArgs}"> <j:forEach var="somejvmarg" items="${listOfJvmArgs}">
<jvmarg value="${somejvmarg}"/> <jvmarg value="${somejvmarg}"/>
@ -173,6 +177,10 @@
<j:forEach var="someProperty" items="${listOfProperties}"> <j:forEach var="someProperty" items="${listOfProperties}">
<sysproperty key="${someProperty}" value="${context.getVariable(someProperty)}"/> <sysproperty key="${someProperty}" value="${context.getVariable(someProperty)}"/>
</j:forEach> </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> <u:tokenize var="listOfJvmArgs" delim=" ">${maven.junit.jvmargs}</u:tokenize>
<j:forEach var="somejvmarg" items="${listOfJvmArgs}"> <j:forEach var="somejvmarg" items="${listOfJvmArgs}">
<jvmarg value="${somejvmarg}"/> <jvmarg value="${somejvmarg}"/>
@ -225,6 +233,10 @@
<j:forEach var="someProperty" items="${listOfProperties}"> <j:forEach var="someProperty" items="${listOfProperties}">
<sysproperty key="${someProperty}" value="${context.getVariable(someProperty)}"/> <sysproperty key="${someProperty}" value="${context.getVariable(someProperty)}"/>
</j:forEach> </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> <u:tokenize var="listOfJvmArgs" delim=" ">${maven.junit.jvmargs}</u:tokenize>
<j:forEach var="somejvmarg" items="${listOfJvmArgs}"> <j:forEach var="somejvmarg" items="${listOfJvmArgs}">
<jvmarg value="${somejvmarg}"/> <jvmarg value="${somejvmarg}"/>
@ -298,6 +310,10 @@
<j:forEach var="someProperty" items="${listOfProperties}"> <j:forEach var="someProperty" items="${listOfProperties}">
<sysproperty key="${someProperty}" value="${context.getVariable(someProperty)}"/> <sysproperty key="${someProperty}" value="${context.getVariable(someProperty)}"/>
</j:forEach> </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" /> <maven:pluginVar var="jvmargs" plugin="maven-test-plugin" property="maven.junit.jvmargs" />
<j:if test="${!empty(jvmArgs)}"> <j:if test="${!empty(jvmArgs)}">
<jvmarg line="${jvmargs}"/> <jvmarg line="${jvmargs}"/>

1
test/plugin.properties
View File

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

1
test/xdocs/changes.xml
View File

@ -25,6 +25,7 @@
</properties> </properties>
<body> <body>
<release version="1.6-SNAPSHOT" date="in CVS"> <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-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-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> <action dev="brett" type="fix" issue="MPTEST-25">Honour maven.test.failure.ignore for test:single and test:match</action>

18
test/xdocs/properties.xml
View File

@ -195,8 +195,7 @@
<td>Yes</td> <td>Yes</td>
<td> <td>
If fork is enabled, additional parameters may be passed to the new VM. If fork is enabled, additional parameters may be passed to the new VM.
You can specify some args separate by space. You can specify some args separated by a space.
Each arg is describe in sub properties.
Sample : Sample :
<source><![CDATA[ <source><![CDATA[
maven.junit.jvmargs=-Xmx160m -verbose maven.junit.jvmargs=-Xmx160m -verbose
@ -204,6 +203,21 @@ maven.junit.jvmargs=-Xmx160m -verbose
</source> </source>
</td> </td>
</tr> </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>
</tr>
<tr> <tr>
<td>maven.junit.sysproperties</td> <td>maven.junit.sysproperties</td>
<td>Yes</td> <td>Yes</td>