Fix deadlock in runAll

Author: felixmulder

compiler/test/dotty/tools/dotc/ParallelTesting.scala

@@ -309,7 +309,7 @@ trait ParallelTesting { self =>
         Runtime.getRuntime.exec(fullArgs).waitFor() == 0
       } else true
 
-      val reporter = TestReporter.parallelReporter(this, logLevel =
+      val reporter = TestReporter.parallelReporter(self, logLevel =
         if (suppressErrors || suppressAllOutput) ERROR + 1 else ERROR)
       val driver =
         if (times == 1) new Driver { def newCompiler(implicit ctx: Context) = new Compiler }
@@ -436,9 +436,13 @@ trait ParallelTesting { self =>
                 meth.invoke(null, Array("jvm")) // partest passes at least "jvm" as an arg
               }
             }
-          } finally {
             System.setOut(oldOut)
             System.setErr(oldErr)
+          } catch {
+            case t: Throwable =>
+              System.setOut(oldOut)
+              System.setErr(oldErr)
+              throw t
           }
         }
       }

compiler/test/dotty/tools/dotc/reporting/TestReporter.scala

@@ -15,7 +15,7 @@ import diagnostic.{ Message, MessageContainer, NoExplanation }
 import diagnostic.messages._
 import interfaces.Diagnostic.{ ERROR, WARNING, INFO }
 
-class TestReporter protected (outWriter: PrintWriter, filePrintln: String => Unit, logLevel: Int)
+class TestReporter protected (outWriter: () => PrintWriter, filePrintln: String => Unit, logLevel: Int)
 extends Reporter with UniqueMessagePositions with HideNonSensicalMessages with MessageRendering {
   import MessageContainer._
 
@@ -53,8 +53,8 @@ extends Reporter with UniqueMessagePositions with HideNonSensicalMessages with M
     val extraInfo = inlineInfo(m.pos)
 
     if (m.level >= logLevel) {
-      outWriter.println(msg)
-      if (extraInfo.nonEmpty) outWriter.println(extraInfo)
+      outWriter().println(msg)
+      if (extraInfo.nonEmpty) outWriter().println(extraInfo)
     }
 
     _messageBuf.append(msg)
@@ -94,22 +94,19 @@ object TestReporter {
   }
 
   def parallelReporter(lock: AnyRef, logLevel: Int): TestReporter = new TestReporter(
-    new PrintWriter(Console.err, true),
-    str => lock.synchronized {
-      logWriter.println(str)
-      logWriter.flush()
-    },
+    () => lock.synchronized { new PrintWriter(Console.err, true) },
+    str => lock.synchronized { writeToLog(str) },
     logLevel
   )
 
   def reporter(logLevel: Int): TestReporter = new TestReporter(
-    new PrintWriter(Console.err, true),
+    () => new PrintWriter(Console.err, true),
     writeToLog,
     logLevel
   )
 
   def simplifiedReporter(writer: PrintWriter): TestReporter = new TestReporter(
-    writer,
+    () => writer,
     writeToLog,
     WARNING
   ) {