Update compiler/test/dotty/tools/dotc/coverage/CoverageTests.scala

Co-authored-by: Guillaume Raffin <[email protected]>

Author: nicolasstucki

compiler/test/dotty/tools/dotc/coverage/CoverageTests.scala

@@ -41,24 +41,26 @@ class CoverageTests:
         lines
     end fixWindowsPaths
 
-    Files.walk(dir).filter(scalaFile.matches).forEach(path => {
-      if Properties.testsFilter.isEmpty || Properties.testsFilter.exists(path.toString.contains) then
-        val fileName = path.getFileName.toString.stripSuffix(".scala")
-        val targetDir = computeCoverageInTmp(path, dir, run)
-        val targetFile = targetDir.resolve(s"scoverage.coverage")
-        val expectFile = path.resolveSibling(s"$fileName.scoverage.check")
-
-        if updateCheckFiles then
-          Files.copy(targetFile, expectFile, StandardCopyOption.REPLACE_EXISTING)
-        else
-          val expected = fixWindowsPaths(Files.readAllLines(expectFile).asScala)
-          val obtained = fixWindowsPaths(Files.readAllLines(targetFile).asScala)
-          if expected != obtained then
-            for ((exp, actual),i) <- expected.zip(obtained).filter(_ != _).zipWithIndex do
-              Console.err.println(s"wrong line ${i+1}:")
-              Console.err.println(s"  expected: $exp")
-              Console.err.println(s"  actual  : $actual")
-            fail(s"$targetFile differs from expected $expectFile")
+    def runOnFile(p: Path): Boolean =
+      scalaFile.matches(p) &&
+      (Properties.testsFilter.isEmpty || Properties.testsFilter.exists(p.toString.contains))
+    
+    Files.walk(dir).filter(runOnFile).forEach(path => {
+      val fileName = path.getFileName.toString.stripSuffix(".scala")
+      val targetDir = computeCoverageInTmp(path, dir, run)
+      val targetFile = targetDir.resolve(s"scoverage.coverage")
+      val expectFile = path.resolveSibling(s"$fileName.scoverage.check")
+      if updateCheckFiles then
+        Files.copy(targetFile, expectFile, StandardCopyOption.REPLACE_EXISTING)
+      else
+        val expected = fixWindowsPaths(Files.readAllLines(expectFile).asScala)
+        val obtained = fixWindowsPaths(Files.readAllLines(targetFile).asScala)
+        if expected != obtained then
+          for ((exp, actual),i) <- expected.zip(obtained).filter(_ != _).zipWithIndex do
+            Console.err.println(s"wrong line ${i+1}:")
+            Console.err.println(s"  expected: $exp")
+            Console.err.println(s"  actual  : $actual")
+          fail(s"$targetFile differs from expected $expectFile")
 
     })