Repository: hbase Updated Branches: refs/heads/0.98 d2111dbda -> 21215a2ae
HBASE-12160 Make Surefire's argLine configurable in the command line Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/21215a2a Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/21215a2a Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/21215a2a Branch: refs/heads/0.98 Commit: 21215a2ae46e2ef32c4c4bb4359a350359813cd0 Parents: d2111db Author: Elliott Clark <[email protected]> Authored: Thu Oct 2 13:35:15 2014 -0700 Committer: Elliott Clark <[email protected]> Committed: Thu Oct 2 15:24:07 2014 -0700 ---------------------------------------------------------------------- pom.xml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/21215a2a/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 7f9eccf..7147db5 100644 --- a/pom.xml +++ b/pom.xml @@ -511,6 +511,7 @@ <testFailureIgnore>${surefire.testFailureIgnore}</testFailureIgnore> <forkedProcessTimeoutInSeconds>${surefire.timeout}</forkedProcessTimeoutInSeconds> <argLine>-enableassertions -Xmx1900m -XX:MaxPermSize=100m -Djava.security.egd=file:/dev/./urandom -Djava.net.preferIPv4Stack=true -Djava.awt.headless=true</argLine> + <argLine>${hbase-surefire.argLine}</argLine> <redirectTestOutputToFile>${test.output.tofile}</redirectTestOutputToFile> </configuration> <executions> @@ -952,6 +953,14 @@ <surefire.testFailureIgnore>false</surefire.testFailureIgnore> <test.output.tofile>true</test.output.tofile> <surefire.timeout>900</surefire.timeout> + <hbase-surefire.argLine>-enableassertions -XX:MaxDirectMemorySize=1G -Xmx1900m + -XX:MaxPermSize=256m -Djava.security.egd=file:/dev/./urandom -Djava.net.preferIPv4Stack=true + -Djava.awt.headless=true + </hbase-surefire.argLine> + <hbase-surefire.cygwin-argline>-enableassertions -Xmx1900m -XX:MaxPermSize=256m + -Djava.security.egd=file:/dev/./urandom -Djava.net.preferIPv4Stack=true + "-Djava.library.path=${hadoop.library.path};${java.library.path}" + </hbase-surefire.cygwin-argline> </properties> <!-- Sorted by groups of dependencies then groupId and artifactId --> <dependencyManagement> @@ -1454,7 +1463,7 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <argLine>-enableassertions -Xmx1900m -XX:MaxPermSize=256m -Djava.security.egd=file:/dev/./urandom -Djava.net.preferIPv4Stack=true "-Djava.library.path=${hadoop.library.path};${java.library.path}"</argLine> + <argLine>${hbase-surefire.cygwin-argline}</argLine> <systemProperties> <property> <name>java.net.preferIPv4Stack</name>
