test/testlibrary/com/oracle/java/testlibrary/ProcessTools.java

rev 6236 : 8039260: c.o.j.t.ProcessTools::createJavaProcessBuilder(boolean, String... ) must also take TestJavaOptions
Reviewed-by: iignatyev
Contributed-by: lev.priima@oracle.com

*** 143,164 ****
     */
    public static ProcessBuilder createJavaProcessBuilder(String... command) throws Exception {
      return createJavaProcessBuilder(false, command);
    }
  
!   public static ProcessBuilder createJavaProcessBuilder(boolean addTestVmOptions, String... command) throws Exception {
      String javapath = JDKToolFinder.getJDKTool("java");
  
      ArrayList<String> args = new ArrayList<>();
      args.add(javapath);
      Collections.addAll(args, getPlatformSpecificVMArgs());
  
!     if (addTestVmOptions) {
!       String vmopts = System.getProperty("test.vm.opts");
!       if (vmopts != null && vmopts.length() > 0) {
!         Collections.addAll(args, vmopts.split("\\s"));
!       }
      }
  
      Collections.addAll(args, command);
  
      // Reporting
--- 143,161 ----
     */
    public static ProcessBuilder createJavaProcessBuilder(String... command) throws Exception {
      return createJavaProcessBuilder(false, command);
    }
  
!   public static ProcessBuilder createJavaProcessBuilder(boolean addTestVmAndJavaOptions, String... command) throws Exception {
      String javapath = JDKToolFinder.getJDKTool("java");
  
      ArrayList<String> args = new ArrayList<>();
      args.add(javapath);
      Collections.addAll(args, getPlatformSpecificVMArgs());
  
!     if (addTestVmAndJavaOptions) {
!       Collections.addAll(args, Utils.getTestJavaOpts());
      }
  
      Collections.addAll(args, command);
  
      // Reporting