# HG changeset patch
# User mgerdin
# Date 1381836561 25200
# Node ID 82fcc0567fefbe3a99e9045d32c2be3ade9c9cbd
# Parent  d6818f623792d3761210dc4e206214d71d9def04# Parent  027006a47a6df5ddef2a3ffab9ae5addd7a0d196
Merge

diff -r 027006a47a6d -r 82fcc0567fef test/serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java
--- a/test/serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java	Mon Oct 14 14:21:34 2013 +0200
+++ b/test/serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java	Tue Oct 15 04:29:21 2013 -0700
@@ -59,7 +59,7 @@
         // 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();
diff -r 027006a47a6d -r 82fcc0567fef test/testlibrary/com/oracle/java/testlibrary/JDKToolLauncher.java
--- a/test/testlibrary/com/oracle/java/testlibrary/JDKToolLauncher.java	Mon Oct 14 14:21:34 2013 +0200
+++ b/test/testlibrary/com/oracle/java/testlibrary/JDKToolLauncher.java	Tue Oct 15 04:29:21 2013 -0700
@@ -56,7 +56,7 @@
         if (useCompilerJDK) {
             executable = JDKToolFinder.getJDKTool(tool);
         } else {
-            executable = JDKToolFinder.getCurrentJDKTool(tool);
+            executable = JDKToolFinder.getTestJDKTool(tool);
         }
         vmArgs.addAll(Arrays.asList(ProcessTools.getPlatformSpecificVMArgs()));
     }