Refactor filter in idempotency test

Author: liufengyun

compiler/test/dotty/tools/dotc/IdempotencyTests.scala

@@ -18,14 +18,18 @@ class IdempotencyTests {
   import IdempotencyTests._
   import CompilationTest.aggregateTests
 
+  val filter = FileFilter.exclude(
+    s"pos${JFile.separator}i6507b"
+  )
+
   @Category(Array(classOf[SlowTests]))
   @Test def idempotency: Unit = {
     implicit val testGroup: TestGroup = TestGroup("idempotency")
     val opt = defaultOptions
 
     val posIdempotency = aggregateTests(
-      compileFilesInDir("tests/pos", opt)(TestGroup("idempotency/posIdempotency1")),
-      compileFilesInDir("tests/pos", opt)(TestGroup("idempotency/posIdempotency2")),
+      compileFilesInDir("tests/pos", opt, filter)(TestGroup("idempotency/posIdempotency1")),
+      compileFilesInDir("tests/pos", opt, filter)(TestGroup("idempotency/posIdempotency2")),
     )
 
     val orderIdempotency = {

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

@@ -5,6 +5,10 @@ sealed trait FileFilter {
 }
 
 object FileFilter {
+  def exclude(file: String): FileFilter = exclude(file :: Nil)
+
+  def exclude(file: String, files: String*): FileFilter =
+    exclude(file :: files.toList)
 
   def exclude(files: List[String]): FileFilter = new FileFilter {
     private val blackList = files.toSet

tests/idempotency/IdempotencyCheck.scala

@@ -6,13 +6,6 @@ import java.util.stream.Stream as JStream
 import scala.collection.JavaConverters.*
 
 object IdempotencyCheck {
-  val flakyTestsOnWindows =
-    if scala.util.Properties.isWin
-    then Set(s"pos${JFile.separator}i6507b")
-    else Set.empty
-
-  val blacklisted = flakyTestsOnWindows
-
   def checkIdempotency(dir1: String, dir2: String): Unit = {
     var failed = 0
     var total = 0
@@ -32,7 +25,7 @@ object IdempotencyCheck {
       }
       val groups = bytecodeFiles.groupBy(_._1).mapValues(_.map(_._2))
 
-      groups.filterNot(x => blacklisted(x._1)).iterator.flatMap { g =>
+      groups.iterator.flatMap { g =>
         def pred(f: JPath, dir: String, isTasty: Boolean) =
           f.toString.contains(dir) && f.toString.endsWith(if (isTasty) ".tasty" else ".class")
         val class1 = g._2.find(f => pred(f, dir1String, isTasty = false))