You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2012/08/05 15:49:51 UTC
svn commit: r1369588 - in
/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture:
SurefireLauncher.java SurefireVerifierException.java
Author: olamy
Date: Sun Aug 5 13:49:51 2012
New Revision: 1369588
URL: http://svn.apache.org/viewvc?rev=1369588&view=rev
Log:
use a temp file for interpolated settings to avoid concurrent issue wueh running -Pparallel: I hope will fix krosenv issue as I cannot reproduce :-)
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireVerifierException.java
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java?rev=1369588&r1=1369587&r2=1369588&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java Sun Aug 5 13:49:51 2012
@@ -282,13 +282,17 @@ public class SurefireLauncher
String userLocalRepo = System.getProperty( "user.localRepository" );
String testBuildDirectory = System.getProperty( "testBuildDirectory" );
- File interpolatedSettings = new File( testBuildDirectory, "interpolated-settings.xml" );
- if ( !interpolatedSettings.exists() )
+ File interpolatedSettings = null;
+
+ try
{
- // hack "a la" invoker plugin to download dependencies from local repo
- // and not download from central
- try
+
+ interpolatedSettings = File.createTempFile( "interpolated-settings", "xml" );
+
+ if ( !interpolatedSettings.exists() )
{
+ // hack "a la" invoker plugin to download dependencies from local repo
+ // and not download from central
Map<String, String> values = new HashMap<String, String>( 1 );
values.put( "localRepositoryUrl", toUrl( userLocalRepo ) );
@@ -302,23 +306,21 @@ public class SurefireLauncher
}
- catch ( IOException e )
- {
- throw new SurefireVerifierException( e );
- }
- }
- cliOptions.add( "-s " + interpolatedSettings.getAbsolutePath() );
+ cliOptions.add( "-s " + interpolatedSettings.getAbsolutePath() );
+
+ verifier.setCliOptions( cliOptions );
- verifier.setCliOptions( cliOptions );
- try
- {
verifier.executeGoals( goals, envvars );
return surefireVerifier;
}
+ catch ( IOException e )
+ {
+ throw new SurefireVerifierException( e.getMessage(), e );
+ }
catch ( VerificationException e )
{
- throw new SurefireVerifierException( e );
+ throw new SurefireVerifierException( e.getMessage(), e );
}
finally
{
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireVerifierException.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireVerifierException.java?rev=1369588&r1=1369587&r2=1369588&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireVerifierException.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireVerifierException.java Sun Aug 5 13:49:51 2012
@@ -25,6 +25,11 @@ package org.apache.maven.surefire.its.fi
public class SurefireVerifierException
extends RuntimeException
{
+ public SurefireVerifierException( String message, Throwable cause )
+ {
+ super( message, cause );
+ }
+
public SurefireVerifierException( Throwable cause )
{
super( cause );