Skip to content

Commit 0840786

Browse files
Allow expected test errors to be in java sources
1 parent 7f08fe2 commit 0840786

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -228,8 +228,10 @@ trait ParallelTesting extends RunnerOrchestration { self =>
228228
*/
229229
final def checkFile(testSource: TestSource): Option[JFile] = (testSource match {
230230
case ts: JointCompilationSource =>
231-
ts.files.collectFirst { case f if !f.isDirectory => new JFile(f.getPath.replaceFirst("\\.scala$", ".check")) }
232-
231+
ts.files.collectFirst {
232+
case f if !f.isDirectory =>
233+
new JFile(f.getPath.replaceFirst("\\.(scala|java)$", ".check"))
234+
}
233235
case ts: SeparateCompilationSource =>
234236
Option(new JFile(ts.dir.getPath + ".check"))
235237
}).filter(_.exists)
@@ -678,7 +680,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
678680
def getErrorMapAndExpectedCount(files: Seq[JFile]): (HashMap[String, Integer], Int) = {
679681
val errorMap = new HashMap[String, Integer]()
680682
var expectedErrors = 0
681-
files.filter(_.getName.endsWith(".scala")).foreach { file =>
683+
files.filter(isSourceFile).foreach { file =>
682684
Using(Source.fromFile(file, "UTF-8")) { source =>
683685
source.getLines.zipWithIndex.foreach { case (line, lineNbr) =>
684686
val errors = line.toSeq.sliding("// error".length).count(_.unwrap == "// error")

0 commit comments

Comments
 (0)