Merge pull request #14268 from dwijnand/testFilter-plural

Split dotty.tests.filter by comma, to select multiple

Author: anatoliykmetyuk

compiler/test/dotc/comptest.scala

@@ -10,7 +10,7 @@ object comptest extends ParallelTesting {
   def numberOfSlaves = 5
   def safeMode = false
   def isInteractive = true
-  def testFilter = None
+  def testFilter = Nil
   def updateCheckFiles: Boolean = false
 
   val posDir = "./tests/pos/"

compiler/test/dotty/Properties.scala

@@ -26,7 +26,7 @@ object Properties {
   /** Filter out tests not matching the regex supplied by "dotty.tests.filter"
    *  define
    */
-  val testsFilter: Option[String] = sys.props.get("dotty.tests.filter")
+  val testsFilter: List[String] = sys.props.get("dotty.tests.filter").fold(Nil)(_.split(',').toList)
 
   /** Tests should override the checkfiles with the current output */
   val testsUpdateCheckfile: Boolean =

compiler/test/dotty/tools/dotc/transform/PatmatExhaustivityTest.scala

@@ -65,7 +65,7 @@ class PatmatExhaustivityTest {
       .filter(f => f.extension == "scala" || f.isDirectory)
       .filter { f =>
         val path = if f.isDirectory then f.path + "/" else f.path
-        Properties.testsFilter.getOrElse("").split(',').exists(path.contains)
+        Properties.testsFilter.isEmpty || Properties.testsFilter.exists(path.contains)
       }
       .map(f => if f.isDirectory then compileDir(f.jpath) else compileFile(f.jpath))
 

compiler/test/dotty/tools/utils.scala

@@ -17,7 +17,7 @@ def scripts(path: String): Array[File] = {
   assert(dir.exists && dir.isDirectory, "Couldn't load scripts dir")
   dir.listFiles.filter { f =>
     val path = if f.isDirectory then f.getPath + "/" else f.getPath
-    path.contains(Properties.testsFilter.getOrElse(""))
+    Properties.testsFilter.isEmpty || Properties.testsFilter.exists(path.contains)
   }
 }
 

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

@@ -45,11 +45,11 @@ trait ParallelTesting extends RunnerOrchestration { self =>
    */
   def isInteractive: Boolean
 
-  /** A string which is used to filter which tests to run, if `None` will run
-   *  all tests. All absolute paths that contain the substring `testFilter`
+  /** A list of strings which is used to filter which tests to run, if `Nil` will run
+   *  all tests. All absolute paths that contain any of the substrings in `testFilter`
    *  will be run
    */
-  def testFilter: Option[String]
+  def testFilter: List[String]
 
   /** Tests should override the checkfiles with the current output */
   def updateCheckFiles: Boolean
@@ -344,12 +344,12 @@ trait ParallelTesting extends RunnerOrchestration { self =>
 
     /** All testSources left after filtering out */
     private val filteredSources =
-      if (!testFilter.isDefined) testSources
+      if (testFilter.isEmpty) testSources
       else testSources.filter {
         case JointCompilationSource(_, files, _, _, _, _) =>
-          files.exists(file => file.getPath.contains(testFilter.get))
+          testFilter.exists(filter => files.exists(file => file.getPath.contains(filter)))
         case SeparateCompilationSource(_, dir, _, _) =>
-          dir.getPath.contains(testFilter.get)
+          testFilter.exists(dir.getPath.contains)
       }
 
     /** Total amount of test sources being compiled by this test */
@@ -628,9 +628,9 @@ trait ParallelTesting extends RunnerOrchestration { self =>
         else reportPassed()
       }
       else echo {
-        testFilter
-          .map(r => s"""No files matched "$r" in test""")
-          .getOrElse("No tests available under target - erroneous test?")
+        testFilter match
+          case _ :: _ => s"""No files matched "${testFilter.mkString(",")}" in test"""
+          case _      => "No tests available under target - erroneous test?"
       }
 
       this
@@ -1316,10 +1316,9 @@ trait ParallelTesting extends RunnerOrchestration { self =>
 
     val (dirs, files) = compilationTargets(sourceDir, fromTastyFilter)
 
-    val filteredFiles = testFilter match {
-      case Some(str) => files.filter(_.getPath.contains(str))
-      case None => files
-    }
+    val filteredFiles = testFilter match
+      case _ :: _ => files.filter(f => testFilter.exists(f.getPath.contains))
+      case _      => Nil
 
     class JointCompilationSourceFromTasty(
        name: String,

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

@@ -28,7 +28,7 @@ object VulpixMetaTests extends ParallelTesting {
   def numberOfSlaves = 1
   def safeMode = false // Don't fork a new VM after each run test
   def isInteractive = false // Don't beautify output for interactive use.
-  def testFilter = None // Run all the tests.
+  def testFilter = Nil // Run all the tests.
   def updateCheckFiles: Boolean = false
 
   @AfterClass

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

@@ -104,7 +104,7 @@ object VulpixUnitTests extends ParallelTesting {
   def numberOfSlaves = 5
   def safeMode = sys.env.get("SAFEMODE").isDefined
   def isInteractive = !sys.env.contains("DRONE")
-  def testFilter = None
+  def testFilter = Nil
   def updateCheckFiles: Boolean = false
 
   @AfterClass