8321718: ProcessTools.executeProcess calls waitFor before logging

Reviewed-by: dholmes, jpai

test/lib/jdk/test/lib/process/OutputAnalyzer.java

@@ -108,6 +108,14 @@ public final class OutputAnalyzer {
         buffer = OutputBuffer.of(stdout, stderr, exitValue);
     }
 
+    /**
+     * Delegate waitFor to the OutputBuffer. This ensures that
+     * the progress and timestamps are logged correctly.
+     */
+    public void waitFor() {
+        buffer.waitFor();
+    }
+
     /**
      * Verify that the stdout contents of output buffer is empty
      *

test/lib/jdk/test/lib/process/OutputBuffer.java

@@ -44,6 +44,12 @@ public interface OutputBuffer {
     }
   }
 
+  /**
+   * Waits for a process to finish, if there is one assocated with
+   * this OutputBuffer.
+   */
+  public void waitFor();
+
   /**
    * Returns the stdout result
    *
@@ -67,6 +73,13 @@ public interface OutputBuffer {
    * @return stderr result
    */
   public String getStderr();
+
+
+  /**
+   * Returns the exit value
+   *
+   * @return exit value
+   */
   public int getExitValue();
 
   /**
@@ -135,6 +148,31 @@ public interface OutputBuffer {
       errTask = new StreamTask(p.getErrorStream(), cs);
     }
 
+    @Override
+    public void waitFor() {
+      if (exitValue != null) {
+        // Already waited for this process
+        return;
+      }
+
+      try {
+          logProgress("Waiting for completion");
+          boolean aborted = true;
+          try {
+              exitValue = p.waitFor();
+              logProgress("Waiting for completion finished");
+              aborted = false;
+          } finally {
+              if (aborted) {
+                  logProgress("Waiting for completion FAILED");
+              }
+          }
+      } catch (InterruptedException e) {
+        Thread.currentThread().interrupt();
+        throw new OutputBufferException(e);
+      }
+    }
+
     @Override
     public String getStdout() {
       return outTask.get();
@@ -147,27 +185,9 @@ public interface OutputBuffer {
 
     @Override
     public int getExitValue() {
-      if (exitValue != null) {
+      waitFor();
       return exitValue;
     }
-      try {
-          logProgress("Waiting for completion");
-          boolean aborted = true;
-          try {
-              exitValue = p.waitFor();
-              logProgress("Waiting for completion finished");
-              aborted = false;
-              return exitValue;
-          } finally {
-              if (aborted) {
-                  logProgress("Waiting for completion FAILED");
-              }
-          }
-      } catch (InterruptedException e) {
-        Thread.currentThread().interrupt();
-        throw new OutputBufferException(e);
-      }
-    }
 
     @Override
     public long pid() {
@@ -186,6 +206,11 @@ public interface OutputBuffer {
       this.exitValue = exitValue;
     }
 
+    @Override
+    public void waitFor() {
+      // Nothing to do since this buffer is not associated with a Process.
+    }
+
     @Override
     public String getStdout() {
       return stdout;

test/lib/jdk/test/lib/process/ProcessTools.java

@@ -697,7 +697,10 @@ public final class ProcessTools {
             }
 
             output = new OutputAnalyzer(p, cs);
-            p.waitFor();
+
+            // Wait for the process to finish. Call through the output
+            // analyzer to get correct logging and timestamps.
+            output.waitFor();
 
             {   // Dumping the process output to a separate file
                 var fileName = String.format("pid-%d-output.log", p.pid());