Use ConsoleReporter instead of hacking TestReporter

Author: anatoliykmetyuk

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

@@ -2,7 +2,7 @@ package dotty.tools
 package dotc
 package reporting
 
-import java.io.{ PrintStream, PrintWriter, File => JFile, FileOutputStream }
+import java.io.{ PrintStream, PrintWriter, File => JFile, FileOutputStream, StringWriter }
 import java.text.SimpleDateFormat
 import java.util.Date
 import core.Decorators._
@@ -20,14 +20,16 @@ class TestReporter protected (outWriter: PrintWriter, filePrintln: String => Uni
 extends Reporter with UniqueMessagePositions with HideNonSensicalMessages with MessageRendering {
   import MessageContainer._
 
-  protected final val _errorBuf = mutable.ArrayBuffer.empty[(MessageContainer, String)]
-  final def errors: Iterator[(MessageContainer, String)] = _errorBuf.iterator
-  def logError(err: Error)(implicit ctx: Context) =
-    _errorBuf.append(err -> messageAndPos(err.contained(), err.pos, diagnosticLevel(err)))
+  protected final val _errorBuf = mutable.ArrayBuffer.empty[MessageContainer]
+  final def errors: Iterator[MessageContainer] = _errorBuf.iterator
 
   protected final val _messageBuf = mutable.ArrayBuffer.empty[String]
   final def messages: Iterator[String] = _messageBuf.iterator
 
+  protected final val _consoleBuf = new StringWriter
+  protected final val _consoleReporter = new ConsoleReporter(null, new PrintWriter(_consoleBuf))
+  final def consoleOutput: String = _consoleBuf.toString
+
   private[this] var _didCrash = false
   final def compilerCrashed: Boolean = _didCrash
 
@@ -65,6 +67,8 @@ extends Reporter with UniqueMessagePositions with HideNonSensicalMessages with M
   }
 
   override def doReport(m: MessageContainer)(implicit ctx: Context): Unit = {
+    _consoleReporter.doReport(m)
+
     // Here we add extra information that we should know about the error message
     val extra = m.contained() match {
       case pm: PatternMatchExhaustivity => s": ${pm.uncovered}"
@@ -73,7 +77,7 @@ extends Reporter with UniqueMessagePositions with HideNonSensicalMessages with M
 
     m match {
       case m: Error => {
-        logError(m)
+        _errorBuf.append(m)
         printMessageAndPos(m, extra)
       }
       case m =>

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

@@ -91,9 +91,10 @@ trait ParallelTesting extends RunnerOrchestration { self =>
       sb.append(
         s"""|
             |Test '$title' compiled with $errors error(s) and $warnings warning(s),
-            |the test can be reproduced by running:""".stripMargin
+            |the test can be reproduced by running from SBT (prefix it with ./bin/ if you
+            |want to run from the command line):""".stripMargin
       )
-      sb.append("\n\n./bin/dotc ")
+      sb.append("\n\ndotc ")
       flags.all.foreach { arg =>
         if (lineLen > maxLen) {
           sb.append(delimiter)
@@ -638,7 +639,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
       def compilerCrashed = reporters.exists(_.compilerCrashed)
       lazy val (errorMap, expectedErrors) = getErrorMapAndExpectedCount(testSource.sourceFiles)
       lazy val actualErrors = reporters.foldLeft(0)(_ + _.errorCount)
-      def hasMissingAnnotations = getMissingExpectedErrors(errorMap, reporters.iterator.flatMap(_.errors).map(_._1))
+      def hasMissingAnnotations = getMissingExpectedErrors(errorMap, reporters.iterator.flatMap(_.errors))
 
       if (compilerCrashed) Some(s"Compiler crashed when compiling: ${testSource.title}"                                                             )
       else if (actualErrors == 0) Some(s"\nNo errors found when compiling neg test $testSource"                                                            )
@@ -652,7 +653,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
       checkFile(testSource).foreach(diffTest(testSource, _, reporterOutputLines(reporters), reporters, logger))
 
     def reporterOutputLines(reporters: Seq[TestReporter]): List[String] =
-      reporters.flatMap(_.errors).sortBy(_._1.pos.source.toString).map(_._2).toList
+      reporters.flatMap(_.consoleOutput.split("\n")).toList
 
     // In neg-tests we allow two types of error annotations,
     // "nopos-error" which doesn't care about position and "error" which