test/runtime/CommandLine/OptionsValidation/common/optionsvalidation/JVMOption.java

@@ -18,37 +18,34 @@
  *
  * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-
 package optionsvalidation;
 
 import com.sun.tools.attach.VirtualMachine;
 import com.sun.tools.attach.AttachOperationFailedException;
 import java.util.ArrayList;
 import java.util.List;
 import jdk.test.lib.DynamicVMOption;
 import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.Platform;
 import jdk.test.lib.ProcessTools;
 import jdk.test.lib.dcmd.CommandExecutor;
 import jdk.test.lib.dcmd.JMXExecutor;
 import sun.tools.attach.HotSpotVirtualMachine;
 
 import static optionsvalidation.JVMOptionsUtils.failedMessage;
 import static optionsvalidation.JVMOptionsUtils.printOutputContent;
+import static optionsvalidation.JVMOptionsUtils.VMType;
 
 public abstract class JVMOption {
 
     /**
      * Executor for JCMD
      */
     private final static CommandExecutor executor = new JMXExecutor();
     
-    private final static boolean isClient = Platform.isClient();
-
     /**
      * Name of the tested parameter
      */
     protected String name;
 

@@ -342,14 +339,13 @@
         String value = optionValue.substring(optionValue.lastIndexOf("=") + 1);
         String fullOptionString = prependString.toString() + optionValue;
         List<String> runJava = new ArrayList<>();
         OutputAnalyzer out;
 
-        if (isClient) {
-            runJava.add("-client");
+        if (VMType != null) {
+            runJava.add(VMType);
         }
-        
         runJava.addAll(prepend);
         runJava.add(optionValue);
         runJava.add(JVMOptionsUtils.class.getName());
         
         out = new OutputAnalyzer(ProcessTools.createJavaProcessBuilder(runJava.toArray(new String[0])).start());