Commit 6ba902a

authored

Fix line and path separators in test (#23534)

Fixes #23458 Splitting on NL leaves the CR if present. Just use `linesIterator`. Introduce a template method for rendering paths. The test reporter replaces windows convention when run on windows, so that check files are correct; `FileDiff.matches` currently accounts for comparing lines of text when run on windows. Previously, a `TestReporter` with empty console output would contribute a NL because `"".split("\n")` is not empty. (There is a test reporter per compilation group.)

2 parents e1f2505 + 45afde7 commit 6ba902aCopy full SHA for 6ba902a

File tree

47 files changed

+31

-60

lines changed

compiler
- src/dotty/tools/dotc
  - report.scala
  - reporting
    - MessageRendering.scala
- test/dotty/tools
  - dotc/reporting
    - TestReporter.scala
  - vulpix
    - ParallelTesting.scala
tests

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+31

-60

lines changed

`‎compiler/src/dotty/tools/dotc/report.scala‎`

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -144,8 +144,6 @@ object report:`
`144`	`144`	`case Nil => pos`
`145`	`145`	`recur(pos.sourcePos, tpd.enclosingInlineds)`
`146`	`146`
`147`		`- private object messageRendering extends MessageRendering`
`148`		`-`
`149`	`147`	`// Should only be called from Run#enrichErrorMessage.`
`150`	`148`	`def enrichErrorMessage(errorMessage: String)(using Context): String =`
`151`	`149`	`if ctx.settings.XnoEnrichErrorMessages.value then errorMessage`

`‎compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala‎`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ import java.lang.System.{lineSeparator => EOL}`
`8`	`8`
`9`	`9`	`import core.Contexts.*`
`10`	`10`	`import core.Decorators.*`
	`11`	`+import io.AbstractFile`
`11`	`12`	`import printing.Highlighting.{Blue, Red, Yellow}`
`12`	`13`	`import printing.SyntaxHighlighting`
`13`	`14`	`import Diagnostic.*`
`@@ -158,9 +159,12 @@ trait MessageRendering {`
`158`	`159`	`.mkString(EOL)`
`159`	`160`	`}`
`160`	`161`
	`162`	`+ // file.path or munge it to normalize for testing`
	`163`	`+ protected def renderPath(file: AbstractFile): String = file.path`
	`164`	`+`
`161`	`165`	`/** The source file path, line and column numbers from the given SourcePosition */`
`162`	`166`	`protected def posFileStr(pos: SourcePosition): String =`
`163`		`- val path = pos.source.file.path`
	`167`	`+ val path = renderPath(pos.source.file)`
`164`	`168`	`if pos.exists then s"$path:${pos.line + 1}:${pos.column}" else path`
`165`	`169`
`166`	`170`	`/** The separator between errors containing the source file and error type`

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

Lines changed: 24 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,23 +1,25 @@`
`1`		`-package dotty.tools`
	`1`	`+package dotty`
	`2`	`+package tools`
`2`	`3`	`package dotc`
`3`	`4`	`package reporting`
`4`	`5`
`5`		`-import scala.language.unsafeNulls`
`6`		`-import java.io.{BufferedReader, FileInputStream, FileOutputStream, FileReader, PrintStream, PrintWriter, StringReader, StringWriter, FileasJFile}`
	`6`	`+import java.io.{FileasJFile, *}`
	`7`	`+import java.nio.file.Files.readAllLines`
`7`	`8`	`import java.text.SimpleDateFormat`
`8`	`9`	`import java.util.Date`
`9`		`-import core.Decorators.*`
`10`	`10`
`11`		`-import scala.collection.mutable`
`12`		`-import scala.jdk.CollectionConverters.*`
`13`		`-import util.SourcePosition`
`14`	`11`	`import core.Contexts.*`
`15`		`-import Diagnostic.*`
`16`		`-import dotty.Properties`
	`12`	`+import core.Decorators.*`
`17`	`13`	`import interfaces.Diagnostic.{ERROR, WARNING}`
	`14`	`+import io.AbstractFile`
	`15`	`+import util.SourcePosition`
	`16`	`+import Diagnostic.*`
`18`	`17`
`19`		`-import scala.io.Codec`
	`18`	`+import scala.collection.mutable`
`20`	`19`	`import scala.compiletime.uninitialized`
	`20`	`+import scala.io.Codec`
	`21`	`+import scala.jdk.CollectionConverters.*`
	`22`	`+import scala.language.unsafeNulls`
`21`	`23`
`22`	`24`	`class TestReporter protected (outWriter: PrintWriter, logLevel: Int)`
`23`	`25`	`extends Reporter with UniqueMessagePositions with HideNonSensicalMessages with MessageRendering {`
`@@ -30,13 +32,17 @@ extends Reporter with UniqueMessagePositions with HideNonSensicalMessages with M`
`30`	`32`	`final def messages: Iterator[String] = _messageBuf.iterator`
`31`	`33`
`32`	`34`	`protected final val _consoleBuf = new StringWriter`
`33`		`- protected final val _consoleReporter = new ConsoleReporter(null, new PrintWriter(_consoleBuf))`
	`35`	`+ protected final val _consoleReporter = new ConsoleReporter(null, new PrintWriter(_consoleBuf)):`
	`36`	`+ override protected def renderPath(file: AbstractFile): String = TestReporter.renderPath(file)`
	`37`	`+`
`34`	`38`	`final def consoleOutput: String = _consoleBuf.toString`
`35`	`39`
`36`	`40`	`private var _skip: Boolean = false`
`37`	`41`	`final def setSkip(): Unit = _skip = true`
`38`	`42`	`final def skipped: Boolean = _skip`
`39`	`43`
	`44`	`+ override protected def renderPath(file: AbstractFile): String = TestReporter.renderPath(file)`
	`45`	`+`
`40`	`46`	`protected final def inlineInfo(pos: SourcePosition)(using Context): String =`
`41`	`47`	`if (pos.exists) {`
`42`	`48`	`if (pos.outer.exists)`
`@@ -152,10 +158,16 @@ object TestReporter {`
`152`	`158`	`Properties.rerunFailed &&`
`153`	`159`	`failedTestsFile.exists() &&`
`154`	`160`	`failedTestsFile.isFile`
`155`		`- )(java.nio.file.Files.readAllLines(failedTestsFile.toPath).asScala.toList)`
	`161`	`+ )(readAllLines(failedTestsFile.toPath).asScala.toList)`
`156`	`162`
`157`	`163`	`def writeFailedTests(tests: List[String]): Unit =`
`158`	`164`	`initLog()`
`159`	`165`	`tests.foreach(failed => failedTestsWriter.println(failed))`
`160`	`166`	`failedTestsWriter.flush()`
	`167`	`+`
	`168`	`+ def renderPath(file: AbstractFile): String =`
	`169`	`+ if JFile.separatorChar == '\\' then`
	`170`	`+ file.path.replace('\\', '/')`
	`171`	`+ else`
	`172`	`+ file.path`
`161`	`173`	`}`