changeset 946:bdfb6ec5251c

Mention the JVM executable for jvm(), -jvm.
author shade
date Wed, 13 Aug 2014 22:59:50 +0400
parents 60e8aae7ac7d
children 0234208765da
files jmh-core/src/main/java/org/openjdk/jmh/runner/options/CommandLineOptions.java jmh-core/src/main/java/org/openjdk/jmh/runner/options/Options.java
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/jmh-core/src/main/java/org/openjdk/jmh/runner/options/CommandLineOptions.java	Wed Aug 13 11:57:37 2014 +0400
+++ b/jmh-core/src/main/java/org/openjdk/jmh/runner/options/CommandLineOptions.java	Wed Aug 13 22:59:50 2014 +0400
@@ -162,7 +162,7 @@
         OptionSpec<Integer> optThreadGroups = parser.accepts("tg", "Override thread group distribution for asymmetric benchmarks.")
                 .withRequiredArg().withValuesSeparatedBy(',').ofType(Integer.class).describedAs("int+");
 
-        OptionSpec<String> optJvm = parser.accepts("jvm", "Custom JVM to use when forking.")
+        OptionSpec<String> optJvm = parser.accepts("jvm", "Custom JVM to use when forking (path to JVM executable).")
                 .withRequiredArg().ofType(String.class).describedAs("string");
 
         OptionSpec<String> optJvmArgs = parser.accepts("jvmArgs", "Custom JVM args to use when forking.")
--- a/jmh-core/src/main/java/org/openjdk/jmh/runner/options/Options.java	Wed Aug 13 11:57:37 2014 +0400
+++ b/jmh-core/src/main/java/org/openjdk/jmh/runner/options/Options.java	Wed Aug 13 22:59:50 2014 +0400
@@ -202,8 +202,8 @@
     Optional<Integer> getWarmupForkCount();
 
     /**
-     * JVM to use for forks
-     * @return JVM binary location
+     * JVM executable to use for forks
+     * @return path to JVM executable
      */
     Optional<String> getJvm();