HBASE-12160 Make Surefire's argLine configurable in the command line

This commit is contained in:
Elliott Clark 2014-10-02 13:35:15 -07:00
parent 74c4dbdf39
commit 0a3c24f601
1 changed files with 10 additions and 2 deletions

12
pom.xml
View File

@ -527,7 +527,7 @@
<testFailureIgnore>${surefire.testFailureIgnore}</testFailureIgnore> <testFailureIgnore>${surefire.testFailureIgnore}</testFailureIgnore>
<forkedProcessTimeoutInSeconds>${surefire.timeout}</forkedProcessTimeoutInSeconds> <forkedProcessTimeoutInSeconds>${surefire.timeout}</forkedProcessTimeoutInSeconds>
<!--Allocate some direct memory for direct memory tests--> <!--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> <redirectTestOutputToFile>${test.output.tofile}</redirectTestOutputToFile>
</configuration> </configuration>
<executions> <executions>
@ -973,6 +973,14 @@
<surefire.testFailureIgnore>false</surefire.testFailureIgnore> <surefire.testFailureIgnore>false</surefire.testFailureIgnore>
<test.output.tofile>true</test.output.tofile> <test.output.tofile>true</test.output.tofile>
<surefire.timeout>900</surefire.timeout> <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> </properties>
<!-- Sorted by groups of dependencies then groupId and artifactId --> <!-- Sorted by groups of dependencies then groupId and artifactId -->
<dependencyManagement> <dependencyManagement>
@ -1475,7 +1483,7 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<configuration> <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> <systemProperties>
<property> <property>
<name>java.net.preferIPv4Stack</name> <name>java.net.preferIPv4Stack</name>