PR: MPTEST-27

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

test/plugin.jelly

@@ -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}"/>
@@ -298,6 +310,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>
             <maven:pluginVar var="jvmargs" plugin="maven-test-plugin" property="maven.junit.jvmargs" />
             <j:if test="${!empty(jvmArgs)}">
                 <jvmarg line="${jvmargs}"/>

test/plugin.properties

@@ -24,6 +24,7 @@ maven.junit.dir = ${basedir}
 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

test/xdocs/changes.xml

@@ -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>

test/xdocs/properties.xml

@@ -195,8 +195,7 @@
           <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
@@ -204,6 +203,21 @@ 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>
+        </tr>
         <tr>
           <td>maven.junit.sysproperties</td>
           <td>Yes</td>