Repository: hbase Updated Branches: refs/heads/master a463aef8b -> 436733c79
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/436733c7 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/436733c7 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/436733c7 Branch: refs/heads/master Commit: 436733c79bbcb715e6cf75cd2063450d0712188c Parents: a463aef Author: Elliott Clark <[email protected]> Authored: Thu Oct 2 13:35:15 2014 -0700 Committer: Elliott Clark <[email protected]> Committed: Thu Oct 2 14:52:49 2014 -0700 ---------------------------------------------------------------------- pom.xml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/436733c7/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index ec750dd..3df27cd 100644 --- a/pom.xml +++ b/pom.xml @@ -471,7 +471,7 @@ <testFailureIgnore>${surefire.testFailureIgnore}</testFailureIgnore> <forkedProcessTimeoutInSeconds>${surefire.timeout}</forkedProcessTimeoutInSeconds> <!--Allocate some direct memory for direct memory tests--> - <argLine>-enableassertions -XX:MaxDirectMemorySize=1G -Xmx1900m -XX:MaxPermSize=256m -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> @@ -932,6 +932,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> @@ -1434,7 +1442,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>
