Return-Path: Delivered-To: apmail-maven-surefire-commits-archive@www.apache.org Received: (qmail 5657 invoked from network); 26 Feb 2006 20:06:18 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 26 Feb 2006 20:06:18 -0000 Received: (qmail 42962 invoked by uid 500); 26 Feb 2006 20:06:18 -0000 Delivered-To: apmail-maven-surefire-commits-archive@maven.apache.org Received: (qmail 42943 invoked by uid 500); 26 Feb 2006 20:06:18 -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 Received: (qmail 42934 invoked by uid 99); 26 Feb 2006 20:06:17 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 26 Feb 2006 12:06:17 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Sun, 26 Feb 2006 12:06:17 -0800 Received: (qmail 5609 invoked by uid 65534); 26 Feb 2006 20:05:57 -0000 Message-ID: <20060226200557.5608.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r381149 - /maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/SurefireBooter.java Date: Sun, 26 Feb 2006 20:05:56 -0000 To: surefire-commits@maven.apache.org From: jvanzyl@apache.org X-Mailer: svnmailer-1.0.7 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: jvanzyl Date: Sun Feb 26 12:05:54 2006 New Revision: 381149 URL: http://svn.apache.org/viewcvs?rev=381149&view=rev Log: [MSUREFIRE-60] workingDirectory in fork mode is not working submitted by: Dan Tran 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=381149&r1=381148&r2=381149&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 Sun Feb 26 12:05:54 2006 @@ -376,11 +376,6 @@ } - if ( workingDirectory != null ) - { - cli.setWorkingDirectory( workingDirectory.getAbsolutePath() ); - } - cli.createArgument().setValue( "-classpath" ); cli.createArgument().setValue( surefireBooterJar + PS + plexusUtilsJar ); @@ -389,6 +384,13 @@ cli.createArgument().setValue( basedir ); + if ( workingDirectory != null ) + { + //both cli's working directory and system property "user.dir" must have the same value + cli.setWorkingDirectory( workingDirectory.getAbsolutePath() ); + cli.createArgument().setValue( workingDirectory.getAbsolutePath() ); + } + if ( debug ) { System.out.println( Commandline.toString( cli.getCommandline() ) ); @@ -676,6 +678,13 @@ throws Exception { String basedir = args[0]; + + String workingDirectory = null; + + if ( args.length == 2 ) + { + workingDirectory = args[1]; + } ClassLoader classLoader = createForkingClassLoader( basedir ); @@ -683,6 +692,11 @@ Thread.currentThread().setContextClassLoader( classLoader ); setSystemProperties( basedir ); + + if ( workingDirectory != null ) + { + System.setProperty( "user.dir", workingDirectory ); + } Properties p = getSurefireProperties( basedir );