Mercurial > hg > truffle

changeset 12897:82fcc0567fef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author mgerdin
date Tue, 15 Oct 2013 04:29:21 -0700
parents d6818f623792 (diff) 027006a47a6d (current diff)
children f16726924734
files
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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();
--- 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()));
     }