Merge pull request #10711 from rmuir/java_home_only

Execute tests with $JAVA_HOME.
This commit is contained in:
Robert Muir 2015-04-22 14:51:36 -04:00
commit a0414599a8
1 changed files with 3 additions and 1 deletions

View File

@ -47,6 +47,7 @@
<tests.heap.size>512m</tests.heap.size> <tests.heap.size>512m</tests.heap.size>
<tests.heapdump.path>${basedir}/logs/</tests.heapdump.path> <tests.heapdump.path>${basedir}/logs/</tests.heapdump.path>
<tests.topn>5</tests.topn> <tests.topn>5</tests.topn>
<jvm.executable>${java.home}${file.separator}bin${file.separator}java</jvm.executable>
<execution.hint.file>.local-${project.version}-execution-hints.log</execution.hint.file> <execution.hint.file>.local-${project.version}-execution-hints.log</execution.hint.file>
<!-- Properties used for building RPM & DEB packages (see common/packaging.properties) --> <!-- Properties used for building RPM & DEB packages (see common/packaging.properties) -->
@ -444,7 +445,7 @@
</execution> </execution>
</executions> </executions>
<configuration> <configuration>
<executable>java</executable> <executable>${jvm.executable}</executable>
<arguments> <arguments>
<argument>-classpath</argument> <argument>-classpath</argument>
<classpath/> <classpath/>
@ -516,6 +517,7 @@
<goal>junit4</goal> <goal>junit4</goal>
</goals> </goals>
<configuration> <configuration>
<jvm>${jvm.executable}</jvm>
<heartbeat>10</heartbeat> <heartbeat>10</heartbeat>
<jvmOutputAction>pipe,warn</jvmOutputAction> <jvmOutputAction>pipe,warn</jvmOutputAction>
<leaveTemporary>true</leaveTemporary> <leaveTemporary>true</leaveTemporary>