File tree Expand file tree Collapse file tree 1 file changed +5
-3
lines changed
compiler/test/dotty/tools/vulpix Expand file tree Collapse file tree 1 file changed +5
-3
lines changed Original file line number Diff line number Diff line change @@ -228,8 +228,10 @@ trait ParallelTesting extends RunnerOrchestration { self =>
228
228
*/
229
229
final def checkFile (testSource : TestSource ): Option [JFile ] = (testSource match {
230
230
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
+ }
233
235
case ts : SeparateCompilationSource =>
234
236
Option (new JFile (ts.dir.getPath + " .check" ))
235
237
}).filter(_.exists)
@@ -678,7 +680,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
678
680
def getErrorMapAndExpectedCount (files : Seq [JFile ]): (HashMap [String , Integer ], Int ) = {
679
681
val errorMap = new HashMap [String , Integer ]()
680
682
var expectedErrors = 0
681
- files.filter(_.getName.endsWith( " .scala " ) ).foreach { file =>
683
+ files.filter(isSourceFile ).foreach { file =>
682
684
Using (Source .fromFile(file, " UTF-8" )) { source =>
683
685
source.getLines.zipWithIndex.foreach { case (line, lineNbr) =>
684
686
val errors = line.toSeq.sliding(" // error" .length).count(_.unwrap == " // error" )
You can’t perform that action at this time.
0 commit comments