Author: bentmann Date: Sat Feb 20 21:46:19 2010 New Revision: 912233 URL: http://svn.apache.org/viewvc?rev=912233&view=rev Log: o Fixed test
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java?rev=912233&r1=912232&r2=912233&view=diff ============================================================================== --- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java (original) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java Sat Feb 20 21:46:19 2010 @@ -182,7 +182,7 @@ Verifier verifier = new Verifier( testDir.getAbsolutePath() ); verifier.setAutoclean( false ); - setUserHome( verifier, new File( testDir, "user.home" ) ); + setUserHome( verifier, new File( testDir, "userhome" ) ); verifier.getCliOptions().add( "--encrypt-master-password" ); verifier.getCliOptions().add( "test" ); verifier.setLogFileName( "log-emp.txt" ); @@ -226,7 +226,14 @@ { // NOTE: We set the user.home directory instead of say settings.security to reflect Maven's normal behavior String path = home.getAbsolutePath(); - verifier.setEnvironmentVariable( "MAVEN_OPTS", "\"-Duser.home=" + path + "\"" ); + if ( path.indexOf( ' ' ) < 0 ) + { + verifier.setEnvironmentVariable( "MAVEN_OPTS", "-Duser.home=" + path ); + } + else + { + verifier.setEnvironmentVariable( "MAVEN_OPTS", "\"-Duser.home=" + path + "\"" ); + } } }