Checkfiles use actual error message format

Author: anatoliykmetyuk

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

@@ -20,8 +20,10 @@ 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]
-  final def errors: Iterator[MessageContainer] = _errorBuf.iterator
+  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 _messageBuf = mutable.ArrayBuffer.empty[String]
   final def messages: Iterator[String] = _messageBuf.iterator
@@ -71,7 +73,7 @@ extends Reporter with UniqueMessagePositions with HideNonSensicalMessages with M
 
     m match {
       case m: Error => {
-        _errorBuf.append(m)
+        logError(m)
         printMessageAndPos(m, extra)
       }
       case m =>

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

@@ -638,7 +638,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))
+      def hasMissingAnnotations = getMissingExpectedErrors(errorMap, reporters.iterator.flatMap(_.errors).map(_._1))
 
       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,8 +652,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
       checkFile(testSource).foreach(diffTest(testSource, _, reporterOutputLines(reporters)))
 
     def reporterOutputLines(reporters: Seq[TestReporter]): List[String] =
-      reporters.flatMap(_.allErrors).sortBy(_.pos.source.toString).flatMap { error =>
-        (error.pos.span.toString + " in " + error.pos.source.file.name) :: error.getMessage().linesIterator.toList }.toList
+      reporters.flatMap(_.errors).sortBy(_._1.pos.source.toString).map(_._2).toList
 
     // In neg-tests we allow two types of error annotations,
     // "nopos-error" which doesn't care about position and "error" which