Change repoter for backend issue, revert a few synchronized blocks

Author: felixmulder

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

@@ -12,7 +12,7 @@ import scala.util.matching.Regex
 class CompilationTests extends ParallelSummaryReport with ParallelTesting {
   import CompilationTests._
 
-  def isInteractive: Boolean = ParallelSummaryReport.isInteractive
+  def isInteractive: Boolean = false//ParallelSummaryReport.isInteractive
 
   def testFilter: Option[Regex] = sys.props.get("dotty.partest.filter").map(r => new Regex(r))
 

compiler/test/dotty/tools/dotc/ParallelSummaryReport.java

@@ -13,7 +13,7 @@
 public class ParallelSummaryReport {
     public final static boolean isInteractive = !System.getenv().containsKey("DRONE");
 
-    private static TestReporter rep = TestReporter.reporter(-1);
+    private static TestReporter rep = TestReporter.reporter(System.out, -1);
     private static ArrayDeque<String> failedTests = new ArrayDeque<>();
     private static ArrayDeque<String> reproduceInstructions = new ArrayDeque<>();
     private static int passed;
@@ -36,7 +36,7 @@ public final static void addReproduceInstruction(String msg) {
     }
 
     @BeforeClass public final static void setup() {
-        rep = TestReporter.reporter(-1);
+        rep = TestReporter.reporter(System.out, -1);
         failedTests = new ArrayDeque<>();
         reproduceInstructions = new ArrayDeque<>();
     }

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

@@ -229,9 +229,8 @@ trait ParallelTesting { self =>
     }
 
     /** Prints to `System.err` if we're not suppressing all output */
-    protected def echo(msg: String): Unit = realStderr.synchronized {
+    protected def echo(msg: String): Unit =
       if (!suppressAllOutput) realStderr.println(msg)
-    }
 
     /** A single `Runnable` that prints a progress bar for the curent `Test` */
     private def createProgressMonitor: Runnable = new Runnable {
@@ -242,14 +241,12 @@ trait ParallelTesting { self =>
           val timestamp = (System.currentTimeMillis - start) / 1000
           val progress = (tCompiled.toDouble / sourceCount * 40).toInt
 
-          realStdout.synchronized {
-            realStdout.print(
-              "[" + ("=" * (math.max(progress - 1, 0))) +
-              (if (progress > 0) ">" else "") +
-              (" " * (39 - progress)) +
-              s"] compiling ($tCompiled/$sourceCount, ${timestamp}s)\r"
-            )
-          }
+          realStdout.print(
+            "[" + ("=" * (math.max(progress - 1, 0))) +
+            (if (progress > 0) ">" else "") +
+            (" " * (39 - progress)) +
+            s"] compiling ($tCompiled/$sourceCount, ${timestamp}s)\r"
+          )
 
           Thread.sleep(100)
           tCompiled = testSourcesCompiled
@@ -267,9 +264,7 @@ trait ParallelTesting { self =>
      */
     protected def tryCompile(testSource: TestSource)(op: => Unit): Unit =
       try {
-        if (!isInteractive) realStdout.synchronized {
-          realStdout.println(s"Testing ${testSource.title}")
-        }
+        if (!isInteractive) realStdout.println(s"Testing ${testSource.title}")
         op
       } catch {
         case NonFatal(e) => {
@@ -321,10 +316,10 @@ trait ParallelTesting { self =>
         Runtime.getRuntime.exec(fullArgs).waitFor() == 0
       } else true
 
-      val reporter = System.out.synchronized {
-        TestReporter.parallelReporter(System.out, logLevel =
+      val reporter =
+        TestReporter.reporter(realStdout, logLevel =
           if (suppressErrors || suppressAllOutput) ERROR + 1 else ERROR)
-      }
+
       val driver =
         if (times == 1) new Driver { def newCompiler(implicit ctx: Context) = new Compiler }
         else new Driver {
@@ -431,16 +426,14 @@ trait ParallelTesting { self =>
       import java.net.{ URL, URLClassLoader }
 
       val printStream = new ByteArrayOutputStream
-      val oldOut = System.out
-      val oldErr = System.err
 
       try {
         // Do classloading magic and running here:
         val ucl = new URLClassLoader(Array(dir.toURI.toURL))
         val cls = ucl.loadClass("Test")
         val meth = cls.getMethod("main", classOf[Array[String]])
 
-        oldOut.synchronized {
+        synchronized {
           try {
             val ps = new PrintStream(printStream)
             System.setOut(ps)
@@ -450,12 +443,12 @@ trait ParallelTesting { self =>
                 meth.invoke(null, Array("jvm")) // partest passes at least "jvm" as an arg
               }
             }
-            System.setOut(oldOut)
-            System.setErr(oldErr)
+            System.setOut(realStdout)
+            System.setErr(realStderr)
           } catch {
             case t: Throwable =>
-              System.setOut(oldOut)
-              System.setErr(oldErr)
+              System.setOut(realStdout)
+              System.setErr(realStderr)
               throw t
           }
         }

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

@@ -2,7 +2,7 @@ package dotty.tools
 package dotc
 package reporting
 
-import java.io.{ PrintWriter, File => JFile, FileOutputStream }
+import java.io.{ PrintStream, PrintWriter, File => JFile, FileOutputStream }
 import java.text.SimpleDateFormat
 import java.util.Date
 
@@ -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)
@@ -93,35 +93,25 @@ object TestReporter {
     logWriter.flush()
   }
 
-  def parallelReporter(lock: AnyRef, logLevel: Int): TestReporter = new TestReporter(
-    () => 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),
-    writeToLog,
-    logLevel
-  )
-
-  def simplifiedReporter(writer: PrintWriter): TestReporter = new TestReporter(
-    () => writer,
-    writeToLog,
-    WARNING
-  ) {
-    /** Prints the message with the given position indication in a simplified manner */
-    override def printMessageAndPos(m: MessageContainer, extra: String)(implicit ctx: Context): Unit = {
-      val msg = s"${m.pos.line + 1}: " + m.contained.kind + extra
-      val extraInfo = inlineInfo(m.pos)
-
-      writer.println(msg)
-      _messageBuf.append(msg)
-
-      if (extraInfo.nonEmpty) {
-        writer.println(extraInfo)
-        _messageBuf.append(extraInfo)
+  def reporter(ps: PrintStream, logLevel: Int): TestReporter =
+    new TestReporter(new PrintWriter(ps, true), writeToLog, logLevel)
+
+  def simplifiedReporter(writer: PrintWriter): TestReporter = {
+    val rep = new TestReporter(writer, writeToLog, WARNING) {
+      /** Prints the message with the given position indication in a simplified manner */
+      override def printMessageAndPos(m: MessageContainer, extra: String)(implicit ctx: Context): Unit = {
+        val msg = s"${m.pos.line + 1}: " + m.contained.kind + extra
+        val extraInfo = inlineInfo(m.pos)
+
+        writer.println(msg)
+        _messageBuf.append(msg)
+
+        if (extraInfo.nonEmpty) {
+          writer.println(extraInfo)
+          _messageBuf.append(extraInfo)
+        }
       }
     }
+    rep
   }
 }