test/lib/testlibrary/jdk/testlibrary/ProcessTools.java

*** 1,7 ****
  /*
!  * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 28,37 ****
--- 28,38 ----
  import java.lang.management.ManagementFactory;
  import java.lang.management.RuntimeMXBean;
  import java.lang.reflect.Field;
  import java.lang.reflect.Method;
  import java.util.ArrayList;
+ import java.util.Arrays;
  import java.util.Collections;
  import java.util.concurrent.CountDownLatch;
  import java.util.Map;
  import java.util.concurrent.Future;
  import java.util.concurrent.TimeUnit;
*** 376,381 ****
--- 377,418 ----
          for (String s : pb.command()) {
              cmd.append(s).append(" ");
          }
          return cmd.toString().trim();
      }
+ 
+     /**
+      * Executes a process, waits for it to finish, prints the process output
+      * to stdout, and returns the process output.
+      *
+      * The process will have exited before this method returns.
+      *
+      * @param cmds The command line to execute.
+      * @return The {@linkplain OutputAnalyzer} instance wrapping the process.
+      */
+     public static OutputAnalyzer executeCommand(String... cmds)
+             throws Throwable {
+         String cmdLine = Arrays.stream(cmds).collect(Collectors.joining(" "));
+         System.out.println("Command line: [" + cmdLine + "]");
+         OutputAnalyzer analyzer = ProcessTools.executeProcess(cmds);
+         System.out.println(analyzer.getOutput());
+         return analyzer;
+     }
+ 
+     /**
+      * Executes a process, waits for it to finish, prints the process output
+      * to stdout and returns the process output.
+      *
+      * The process will have exited before this method returns.
+      *
+      * @param pb The ProcessBuilder to execute.
+      * @return The {@linkplain OutputAnalyzer} instance wrapping the process.
+      */
+     public static OutputAnalyzer executeCommand(ProcessBuilder pb)
+             throws Throwable {
+         String cmdLine = pb.command().stream().collect(Collectors.joining(" "));
+         System.out.println("Command line: [" + cmdLine + "]");
+         OutputAnalyzer analyzer = ProcessTools.executeProcess(pb);
+         System.out.println(analyzer.getOutput());
+         return analyzer;
+     }
  }