[11u] RFR 8212807: tools/jar/multiRelease/Basic.java times out

Aleksey Shipilev shade at redhat.com
Mon Aug 3 09:50:05 UTC 2020


Original fix:
  https://bugs.openjdk.java.net/browse/JDK-8212807
  https://hg.openjdk.java.net/jdk/jdk/rev/d22206f24d59

The patch applies to 11u cleanly, but fails to compile. The hunk that I had to do on my own:

diff -r 96d712b162e6 test/lib/jdk/test/lib/process/OutputAnalyzer.java
--- a/test/lib/jdk/test/lib/process/OutputAnalyzer.java Sun Jun 02 17:13:31 2019 -0400
+++ b/test/lib/jdk/test/lib/process/OutputAnalyzer.java Mon Aug 03 11:45:18 2020 +0200
@@ -79,11 +79,13 @@
      * @param stderr stderr buffer to analyze
      * @param stderr exitValue result to analyze
      */
     public OutputAnalyzer(String stdout, String stderr, int exitValue)
     {
-        buffer = OutputBuffer.of(stdout, stderr, exitValue);
+        this.stdout = stdout;
+        this.stderr = stderr;
+        this.exitValue = exitValue;
     }

OutputBuffer.of is introduced by JDK-8210112, which is too large to backport.

11u webrev:
  https://cr.openjdk.java.net/~shade/8212807/webrev.11u.01/

Testing: jdk/tools/jar/multiRelease/ tests

-- 
Thanks,
-Aleksey



More information about the jdk-updates-dev mailing list