Place all tests source lists in TestSources

Author: nicolasstucki

compiler/test/dotty/tools/FromTastySources.scala

@@ -0,0 +1,56 @@
+package dotty.tools
+
+import java.io.File
+
+import scala.io.Source
+
+object TestSources {
+
+  // Std Lib
+
+  private final val stdLibPath = "scala2-library/src/library/"
+
+  private def blacklistFile: String = "compiler/test/dotc/scala-collections.blacklist"
+
+  def stdLibWhitelisted: List[String] = all.diff(stdLibBlacklisted)
+  def stdLibBlacklisted: List[String] = loadList(blacklistFile).map(stdLibPath + _)
+
+  private def all: List[String] = {
+    def collectAllFilesInDir(dir: File, acc: List[String]): List[String] = {
+      val files = dir.listFiles()
+      val acc2 = files.foldLeft(acc)((acc1, file) => if (file.isFile && file.getPath.endsWith(".scala")) file.getPath :: acc1 else acc1)
+      files.foldLeft(acc2)((acc3, file) => if (file.isDirectory) collectAllFilesInDir(file, acc3) else acc3)
+    }
+    collectAllFilesInDir(new File(stdLibPath), Nil)
+  }
+
+  // pos tests lists
+
+  def posFromTastyBlacklistFile: String = "compiler/test/dotc/pos-from-tasty.blacklist"
+  def posDecompilationBlacklistFile: String = "compiler/test/dotc/pos-decompilation.blacklist"
+  def posRecompilationWhitelistFile: String = "compiler/test/dotc/pos-recompilation.whitelist"
+
+  def posFromTastyBlacklisted: List[String] = loadList(posFromTastyBlacklistFile)
+  def posDecompilationBlacklisted: List[String] = loadList(posDecompilationBlacklistFile)
+  def posRecompilationWhitelist: List[String] = loadList(posRecompilationWhitelistFile)
+
+  // run tests lists
+
+  def runFromTastyBlacklistFile: String = "compiler/test/dotc/run-from-tasty.blacklist"
+  def runDecompilationBlacklistFile: String = "compiler/test/dotc/run-decompilation.blacklist"
+  def runRecompilationWhitelistFile: String = "compiler/test/dotc/run-recompilation.whitelist"
+
+  def runFromTastyBlacklisted: List[String] = loadList(runFromTastyBlacklistFile)
+  def runDecompilationBlacklisted: List[String] = loadList(runDecompilationBlacklistFile)
+  def runRecompilationWhitelist: List[String] = loadList(runRecompilationWhitelistFile)
+
+  // load lists
+
+  private def loadList(path: String): List[String] = Source.fromFile(path, "UTF8").getLines()
+    .map(_.trim) // allow identation
+    .filter(!_.startsWith("#")) // allow comment lines prefixed by #
+    .map(_.takeWhile(_ != '#').trim) // allow comments in the end of line
+    .filter(_.nonEmpty)
+    .toList
+
+}

compiler/test/dotty/tools/ListOfSources.scala

@@ -34,12 +34,12 @@ class CompilationTests extends ParallelTesting {
   // @Test  // enable to test compileStdLib separately with detailed stats
   def compileStdLibOnly: Unit = {
     implicit val testGroup: TestGroup = TestGroup("compileStdLibOnly")
-    compileList("compileStdLib", StdLibSources.whitelisted, scala2Mode.and("-migration", "-Yno-inline", "-Ydetailed-stats"))
+    compileList("compileStdLib", TestSources.stdLibWhitelisted, scala2Mode.and("-migration", "-Yno-inline", "-Ydetailed-stats"))
   }.checkCompile()
 
   @Test def compilePos: Unit = {
     implicit val testGroup: TestGroup = TestGroup("compilePos")
-    compileList("compileStdLib", StdLibSources.whitelisted, scala2Mode.and("-migration", "-Yno-inline")) +
+    compileList("compileStdLib", TestSources.stdLibWhitelisted, scala2Mode.and("-migration", "-Yno-inline")) +
     compileDir("compiler/src/dotty/tools/dotc/ast", defaultOptions) +
     compileDir("compiler/src/dotty/tools/dotc/config", defaultOptions) +
     compileDir("compiler/src/dotty/tools/dotc/core", defaultOptions) +

compiler/test/dotty/tools/StdLibSources.scala

@@ -27,9 +27,9 @@ class FromTastyTests extends ParallelTesting {
 
     implicit val testGroup: TestGroup = TestGroup("posTestFromTasty")
     compileTastyInDir("tests/pos", defaultOptions,
-      fromTastyFilter = FileFilter.exclude(FromTastySources.posFromTastyBlacklisted),
-      decompilationFilter = FileFilter.exclude(FromTastySources.posDecompilationBlacklisted),
-      recompilationFilter = FileFilter.include(FromTastySources.posRecompilationWhitelist)
+      fromTastyFilter = FileFilter.exclude(TestSources.posFromTastyBlacklisted),
+      decompilationFilter = FileFilter.exclude(TestSources.posDecompilationBlacklisted),
+      recompilationFilter = FileFilter.include(TestSources.posRecompilationWhitelist)
     ).checkCompile()
   }
 
@@ -41,9 +41,9 @@ class FromTastyTests extends ParallelTesting {
 
     implicit val testGroup: TestGroup = TestGroup("runTestFromTasty")
     compileTastyInDir("tests/run", defaultOptions,
-      fromTastyFilter = FileFilter.exclude(FromTastySources.runFromTastyBlacklisted),
-      decompilationFilter = FileFilter.exclude(FromTastySources.runDecompilationBlacklisted),
-      recompilationFilter = FileFilter.include(FromTastySources.runRecompilationWhitelist)
+      fromTastyFilter = FileFilter.exclude(TestSources.runFromTastyBlacklisted),
+      decompilationFilter = FileFilter.exclude(TestSources.runDecompilationBlacklisted),
+      recompilationFilter = FileFilter.include(TestSources.runRecompilationWhitelist)
     ).checkRuns()
   }
 }