You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ag...@apache.org on 2014/02/04 19:37:51 UTC
git commit: [SUREFIRE-1056] avoid truncating down to 0 when using
forkCount with small core-multiplier
Updated Branches:
refs/heads/master f816832c1 -> 2fa201d31
[SUREFIRE-1056] avoid truncating down to 0 when using forkCount with small core-multiplier
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/2fa201d3
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/2fa201d3
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/2fa201d3
Branch: refs/heads/master
Commit: 2fa201d31da4add9b0051882cbba0437f4b558d1
Parents: f816832
Author: Andreas Gudian <ag...@apache.org>
Authored: Tue Feb 4 19:37:36 2014 +0100
Committer: Andreas Gudian <ag...@apache.org>
Committed: Tue Feb 4 19:37:36 2014 +0100
----------------------------------------------------------------------
.../maven/plugin/surefire/AbstractSurefireMojo.java | 15 ++++++++++++---
.../maven/plugin/surefire/SurefirePluginTest.java | 8 +++++---
2 files changed, 17 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/2fa201d3/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
index c6f5788..3a12f1c 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
@@ -1753,7 +1753,7 @@ public abstract class AbstractSurefireMojo
private void convertDeprecatedForkMode()
{
String effectiveForkMode = getEffectiveForkMode();
- // FORK_ONCE (default) is represented by the default values of forkCount and reuseForks
+ // FORK_ONCE (default) is represented by the default values of forkCount and reuseForks
if ( ForkConfiguration.FORK_PERTHREAD.equals( effectiveForkMode ) )
{
forkCount = String.valueOf( threadCount );
@@ -1802,7 +1802,16 @@ public abstract class AbstractSurefireMojo
if ( trimmed.endsWith( "C" ) )
{
double multiplier = Double.parseDouble( trimmed.substring( 0, trimmed.length() - 1 ) );
- return (int) ( multiplier * ( (double) Runtime.getRuntime().availableProcessors() ) );
+ double calculated = multiplier * ( (double) Runtime.getRuntime().availableProcessors() );
+
+ if ( calculated > 0d )
+ {
+ return Math.max( (int) calculated, 1 );
+ }
+ else
+ {
+ return 0;
+ }
}
else
{
@@ -2970,7 +2979,7 @@ public abstract class AbstractSurefireMojo
{
this.classpathDependencyExcludes = classpathDependencyExcludes;
}
-
+
public String getClasspathDependencyScopeExclude()
{
return classpathDependencyScopeExclude;
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/2fa201d3/maven-surefire-plugin/src/test/java/org/apache/maven/plugin/surefire/SurefirePluginTest.java
----------------------------------------------------------------------
diff --git a/maven-surefire-plugin/src/test/java/org/apache/maven/plugin/surefire/SurefirePluginTest.java b/maven-surefire-plugin/src/test/java/org/apache/maven/plugin/surefire/SurefirePluginTest.java
index 6fbe4bd..2f8700a 100644
--- a/maven-surefire-plugin/src/test/java/org/apache/maven/plugin/surefire/SurefirePluginTest.java
+++ b/maven-surefire-plugin/src/test/java/org/apache/maven/plugin/surefire/SurefirePluginTest.java
@@ -47,20 +47,22 @@ public class SurefirePluginTest
assertConversionFails( surefirePlugin, "5.0" );
assertConversionFails( surefirePlugin, "5,0C" );
assertConversionFails( surefirePlugin, "5.0CC" );
-
+
assertForkCount( surefirePlugin, 5, "5" );
-
+
int availableProcessors = Runtime.getRuntime().availableProcessors();
assertForkCount( surefirePlugin, 3*availableProcessors, "3C" );
assertForkCount( surefirePlugin, (int) ( 2.5*availableProcessors ), "2.5C" );
assertForkCount( surefirePlugin, availableProcessors, "1.0001 C" );
+ assertForkCount( surefirePlugin, 1, 1d / ( (double) availableProcessors + 1 ) + "C" );
+ assertForkCount( surefirePlugin, 0, "0 C" );
}
private void assertForkCount( SurefirePlugin surefirePlugin, int expected, String value )
{
assertEquals( expected, surefirePlugin.convertWithCoreCount( value ));
}
-
+
private void assertConversionFails( SurefirePlugin surefirePlugin, String value )
{
try {