infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-05 16:09:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

8026199: serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java Compilation failed

Browse Source 
Fixed a compilation failure due to changed method name

Reviewed-by: sla, jbachorik
This commit is contained in:
Fredrik Arvidsson 2013-10-11 13:48:02 +02:00 committed by Staffan Larsen
parent 24118e5deb
commit 44c3da1ed0
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hotspot/test/serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java
View File

@ -59,7 +59,7 @@ public class JMapHProfLargeHeapTest {
// If we are on MacOSX, test if JMap tool is signed, otherwise return
// since test will fail with privilege error.
if (Platform.isOSX()) {
String jmapToolPath = JDKToolFinder.getCurrentJDKTool("jmap");
String jmapToolPath = JDKToolFinder.getTestJDKTool("jmap");
ProcessBuilder codesignProcessBuilder = new ProcessBuilder(
"codesign", "-v", jmapToolPath);
Process codesignProcess = codesignProcessBuilder.start();
@ -107,7 +107,7 @@ public class JMapHProfLargeHeapTest {
System.out.println("Extracted pid: " + pid);
JDKToolLauncher jMapLauncher = JDKToolLauncher
.create("jmap", false);
.createUsingTestJDK("jmap");
jMapLauncher.addToolArg("-dump:format=b,file=" + pid + "-"
+ HEAP_DUMP_FILE_NAME);
jMapLauncher.addToolArg(String.valueOf(pid));

12
hotspot/test/testlibrary/com/oracle/java/testlibrary/JDKToolLauncher.java
View File

@ -56,7 +56,7 @@ public class JDKToolLauncher {
if (useCompilerJDK) {
executable = JDKToolFinder.getJDKTool(tool);
} else {
executable = JDKToolFinder.getCurrentJDKTool(tool);
executable = JDKToolFinder.getTestJDKTool(tool);
}
vmArgs.addAll(Arrays.asList(ProcessTools.getPlatformSpecificVMArgs()));
}
@ -74,17 +74,15 @@ public class JDKToolLauncher {
}
/**
* Creates a new JDKToolLauncher for the specified tool.
* Creates a new JDKToolLauncher for the specified tool in the Tested JDK.
*
* @param tool
* The name of the tool
* @param useCompilerPath
* If true use the compiler JDK path, otherwise use the tested
* JDK path.
*
* @return A new JDKToolLauncher
*/
public static JDKToolLauncher create(String tool, boolean useCompilerJDK) {
return new JDKToolLauncher(tool, useCompilerJDK);
public static JDKToolLauncher createUsingTestJDK(String tool) {
return new JDKToolLauncher(tool, false);
}
/**