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

*** 28,42 ****
  import java.io.InputStreamReader;
  import java.io.Reader;
  import java.util.ArrayList;
  import java.util.Arrays;
  import java.util.List;
! import java.util.HashMap;
  import java.util.Map;
  import java.util.StringTokenizer;
  import java.util.function.Predicate;
  import jdk.test.lib.OutputAnalyzer;
  import jdk.test.lib.ProcessTools;
  
  public class JVMOptionsUtils {
  
      /* Java option which print options with ranges */
--- 28,43 ----
  import java.io.InputStreamReader;
  import java.io.Reader;
  import java.util.ArrayList;
  import java.util.Arrays;
  import java.util.List;
! import java.util.LinkedHashMap;
  import java.util.Map;
  import java.util.StringTokenizer;
  import java.util.function.Predicate;
  import jdk.test.lib.OutputAnalyzer;
+ import jdk.test.lib.Platform;
  import jdk.test.lib.ProcessTools;
  
  public class JVMOptionsUtils {
  
      /* Java option which print options with ranges */
*** 130,140 ****
          String line;
          String token;
          String name;
          StringTokenizer st;
          JVMOption option;
!         Map<String, JVMOption> allOptions = new HashMap<>();
  
          // Skip first line
          line = reader.readLine();
  
          while ((line = reader.readLine()) != null) {
--- 131,141 ----
          String line;
          String token;
          String name;
          StringTokenizer st;
          JVMOption option;
!         Map<String, JVMOption> allOptions = new LinkedHashMap<>();
  
          // Skip first line
          line = reader.readLine();
  
          while ((line = reader.readLine()) != null) {
*** 327,340 ****
          List<String> runJava = new ArrayList<>();
  
          if (additionalArgs.length > 0) {
              runJava.addAll(Arrays.asList(additionalArgs));
          }
          runJava.add(PRINT_FLAGS_RANGES);
          runJava.add("-version");
  
!         p = ProcessTools.createJavaProcessBuilder(true, runJava.toArray(new String[0])).start();
  
          result = getJVMOptions(new InputStreamReader(p.getInputStream()), withRanges, acceptOrigin);
  
          p.waitFor();
  
--- 328,346 ----
          List<String> runJava = new ArrayList<>();
  
          if (additionalArgs.length > 0) {
              runJava.addAll(Arrays.asList(additionalArgs));
          }
+         
+         if (Platform.isClient()) {
+             runJava.add("-client");
+         }
+         
          runJava.add(PRINT_FLAGS_RANGES);
          runJava.add("-version");
  
!         p = ProcessTools.createJavaProcessBuilder(runJava.toArray(new String[0])).start();
  
          result = getJVMOptions(new InputStreamReader(p.getInputStream()), withRanges, acceptOrigin);
  
          p.waitFor();