Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/test/serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java	Wed Oct 09 22:01:59 2013 -0400
     1.2 +++ b/test/serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java	Fri Oct 11 13:48:02 2013 +0200
     1.3 @@ -59,7 +59,7 @@
     1.4          // If we are on MacOSX, test if JMap tool is signed, otherwise return
     1.5          // since test will fail with privilege error.
     1.6          if (Platform.isOSX()) {
     1.7 -            String jmapToolPath = JDKToolFinder.getCurrentJDKTool("jmap");
     1.8 +            String jmapToolPath = JDKToolFinder.getTestJDKTool("jmap");
     1.9              ProcessBuilder codesignProcessBuilder = new ProcessBuilder(
    1.10                      "codesign", "-v", jmapToolPath);
    1.11              Process codesignProcess = codesignProcessBuilder.start();
    1.12 @@ -107,7 +107,7 @@
    1.13              System.out.println("Extracted pid: " + pid);
    1.14  
    1.15              JDKToolLauncher jMapLauncher = JDKToolLauncher
    1.16 -                    .create("jmap", false);
    1.17 +                    .createUsingTestJDK("jmap");
    1.18              jMapLauncher.addToolArg("-dump:format=b,file=" + pid + "-"
    1.19                      + HEAP_DUMP_FILE_NAME);
    1.20              jMapLauncher.addToolArg(String.valueOf(pid));

     2.1 --- a/test/testlibrary/com/oracle/java/testlibrary/JDKToolLauncher.java	Wed Oct 09 22:01:59 2013 -0400
     2.2 +++ b/test/testlibrary/com/oracle/java/testlibrary/JDKToolLauncher.java	Fri Oct 11 13:48:02 2013 +0200
     2.3 @@ -56,7 +56,7 @@
     2.4          if (useCompilerJDK) {
     2.5              executable = JDKToolFinder.getJDKTool(tool);
     2.6          } else {
     2.7 -            executable = JDKToolFinder.getCurrentJDKTool(tool);
     2.8 +            executable = JDKToolFinder.getTestJDKTool(tool);
     2.9          }
    2.10          vmArgs.addAll(Arrays.asList(ProcessTools.getPlatformSpecificVMArgs()));
    2.11      }
    2.12 @@ -74,17 +74,15 @@
    2.13      }
    2.14  
    2.15      /**
    2.16 -     * Creates a new JDKToolLauncher for the specified tool.
    2.17 +     * Creates a new JDKToolLauncher for the specified tool in the Tested JDK.
    2.18       *
    2.19       * @param tool
    2.20       *            The name of the tool
    2.21 -     * @param useCompilerPath
    2.22 -     *            If true use the compiler JDK path, otherwise use the tested
    2.23 -     *            JDK path.
    2.24 +     *
    2.25       * @return A new JDKToolLauncher
    2.26       */
    2.27 -    public static JDKToolLauncher create(String tool, boolean useCompilerJDK) {
    2.28 -        return new JDKToolLauncher(tool, useCompilerJDK);
    2.29 +    public static JDKToolLauncher createUsingTestJDK(String tool) {
    2.30 +        return new JDKToolLauncher(tool, false);
    2.31      }
    2.32  
    2.33      /**