Return-Path: Delivered-To: apmail-maven-surefire-commits-archive@www.apache.org Received: (qmail 5741 invoked from network); 21 Jan 2006 17:07:07 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 21 Jan 2006 17:07:07 -0000 Received: (qmail 64320 invoked by uid 500); 21 Jan 2006 17:07:07 -0000 Delivered-To: apmail-maven-surefire-commits-archive@maven.apache.org Received: (qmail 64303 invoked by uid 500); 21 Jan 2006 17:07:06 -0000 Mailing-List: contact surefire-commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: surefire-dev@maven.apache.org Delivered-To: mailing list surefire-commits@maven.apache.org Delivered-To: moderator for surefire-commits@maven.apache.org Received: (qmail 10187 invoked by uid 99); 21 Jan 2006 01:11:32 -0000 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Message-ID: <20060121011110.48738.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r370944 - /maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/SurefireBooter.java Date: Sat, 21 Jan 2006 01:11:09 -0000 To: surefire-commits@maven.apache.org From: kenney@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: kenney Date: Fri Jan 20 17:11:07 2006 New Revision: 370944 URL: http://svn.apache.org/viewcvs?rev=370944&view=rev Log: PR: MSUREFIRE-44 Submitted by: Dan Tran Committed on behalf of Dan Tran. Adds support for configuring the working directory and the environment variables for a forked test. Modified: maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/SurefireBooter.java Modified: maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/SurefireBooter.java URL: http://svn.apache.org/viewcvs/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/SurefireBooter.java?rev=370944&r1=370943&r2=370944&view=diff ============================================================================== --- maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/SurefireBooter.java (original) +++ maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/SurefireBooter.java Fri Jan 20 17:11:07 2006 @@ -37,6 +37,7 @@ import java.util.Arrays; import java.util.Iterator; import java.util.List; +import java.util.Map; import java.util.Properties; /** @@ -73,6 +74,10 @@ private Properties systemProperties; private String argLine; + + private Map environmentVariables; + + private File workingDirectory; private boolean childDelegation; @@ -172,11 +177,21 @@ this.argLine = argLine; } + public void setEnvironmentVariables( Map environmentVariables ) + { + this.environmentVariables = environmentVariables; + } + public void setBasedir( String basedir ) { this.basedir = basedir; } + public void setWorkingDirectory( File dir ) + { + this.workingDirectory = dir; + } + public void setChildDelegation( boolean childDelegation ) { this.childDelegation = childDelegation; @@ -333,6 +348,32 @@ if ( argLine != null ) { cli.addArguments( StringUtils.split( argLine, " " ) ); + } + + if ( environmentVariables != null) + { + Iterator iter = environmentVariables.keySet().iterator(); + + while ( iter.hasNext() ) + { + String key = (String) iter.next(); + + String value = (String) environmentVariables.get( key ); + + cli.addEnvironment( key, value ); + + if ( debug ) + { + System.out.println( "Environment: " + key + "=" + value + " added." ); + } + + } + + } + + if ( workingDirectory != null ) + { + cli.setWorkingDirectory( workingDirectory.getAbsolutePath() ); } cli.createArgument().setValue( "-classpath" );