8321718: ProcessTools.executeProcess calls waitFor before logging

Backport-of: 9ab29f8dcd1c0092e4251f996bd53c704e87a74a

Author: GoeLin

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

@@ -106,6 +106,14 @@ public OutputAnalyzer(String stdout, String stderr, int exitValue)
         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 OutputBufferException(Throwable cause) {
     }
   }
 
+  /**
+   * 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 @@ default public List<String> getStdoutAsList() {
    * @return stderr result
    */
   public String getStderr();
+
+
+  /**
+   * Returns the exit value
+   *
+   * @return exit value
+   */
   public int getExitValue();
 
   /**
@@ -136,28 +149,19 @@ private LazyOutputBuffer(Process p, Charset cs) {
     }
 
     @Override
-    public String getStdout() {
-      return outTask.get();
-    }
-
-    @Override
-    public String getStderr() {
-      return errTask.get();
-    }
-
-    @Override
-    public int getExitValue() {
+    public void waitFor() {
       if (exitValue != null) {
-        return exitValue;
+        // 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;
-              return exitValue;
           } finally {
               if (aborted) {
                   logProgress("Waiting for completion FAILED");
@@ -169,6 +173,22 @@ public int getExitValue() {
       }
     }
 
+    @Override
+    public String getStdout() {
+      return outTask.get();
+    }
+
+    @Override
+    public String getStderr() {
+      return errTask.get();
+    }
+
+    @Override
+    public int getExitValue() {
+      waitFor();
+      return exitValue;
+    }
+
     @Override
     public long pid() {
       return p.pid();
@@ -186,6 +206,11 @@ private EagerOutputBuffer(String stdout, String stderr, int exitValue) {
       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 static OutputAnalyzer executeProcess(ProcessBuilder pb, String input,
             }
 
             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());