draft

Author: robstoll

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

@@ -629,6 +629,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
 
       if (compilerCrashed) Some(s"Compiler crashed when compiling: ${testSource.title}")
       else if (actualErrors == 0) Some(s"\nNo errors found when compiling neg test $testSource")
+      else if (expectedErrors == 0) Some(s"\nNo errors defined in $testSource")
       else if (expectedErrors != actualErrors) Some(s"\nWrong number of errors encountered when compiling $testSource, expected: $expectedErrors, actual: $actualErrors")
       else if (hasMissingAnnotations) Some(s"\nErrors found on incorrect row numbers when compiling $testSource")
       else if (!errorMap.isEmpty) Some(s"\nExpected error(s) have {<error position>=<unreported error>}: $errorMap")
@@ -651,25 +652,30 @@ trait ParallelTesting extends RunnerOrchestration { self =>
       val errorMap = new HashMap[String, Integer]()
       var expectedErrors = 0
       files.filter(_.getName.endsWith(".scala")).foreach { file =>
-        Source.fromFile(file, "UTF-8").getLines().zipWithIndex.foreach { case (line, lineNbr) =>
-          val errors = line.toSeq.sliding("// error".length).count(_.unwrap == "// error")
-          if (errors > 0)
-            errorMap.put(s"${file.getPath}:${lineNbr}", errors)
-
-          val noposErrors = line.toSeq.sliding("// nopos-error".length).count(_.unwrap == "// nopos-error")
-          if (noposErrors > 0) {
-            val nopos = errorMap.get("nopos")
-            val existing: Integer = if (nopos eq null) 0 else nopos
-            errorMap.put("nopos", noposErrors + existing)
-          }
+        val src = Source.fromFile(file, "UTF-8")
+        try {
+          src.getLines().zipWithIndex.foreach { case (line, lineNbr) =>
+            val errors = line.toSeq.sliding("// error".length).count(_.unwrap == "// error")
+            if (errors > 0)
+              errorMap.put(s"${file.getPath}:${lineNbr}", errors)
+
+            val noposErrors = line.toSeq.sliding("// nopos-error".length).count(_.unwrap == "// nopos-error")
+            if (noposErrors > 0) {
+              val nopos = errorMap.get("nopos")
+              val existing: Integer = if (nopos eq null) 0 else nopos
+              errorMap.put("nopos", noposErrors + existing)
+            }
 
-          val possibleTypos = List("//error" -> "// error" , "//nopos-error" -> "// nopos-error")
-          for ((possibleTypo, expected) <- possibleTypos) {
-            if (line.contains(possibleTypo))
-              echo(s"Warning: Possible typo in error tag in file ${file.getCanonicalPath}:$lineNbr: found `$possibleTypo` but expected `$expected`")
-          }
+            val possibleTypos = List("//error" -> "// error", "//nopos-error" -> "// nopos-error")
+            for ((possibleTypo, expected) <- possibleTypos) {
+              if (line.contains(possibleTypo))
+                echo(s"Warning: Possible typo in error tag in file ${file.getCanonicalPath}:$lineNbr: found `$possibleTypo` but expected `$expected`")
+            }
 
-          expectedErrors += noposErrors + errors
+            expectedErrors += noposErrors + errors
+          }
+        } finally {
+          try { src.close() } catch { case _:Throwable => /* ignore failures during close */ }
         }
       }