aboutsummaryrefslogtreecommitdiff
path: root/compiler/test/dotc/tests.scala
diff options
context:
space:
mode:
authorNicolas Stucki <nicolas.stucki@gmail.com>2017-01-05 11:30:36 +0100
committerNicolas Stucki <nicolas.stucki@gmail.com>2017-01-05 11:30:36 +0100
commitd81fbda457620e5a117490684b21be253e992fa5 (patch)
tree9e4759c14c257435e188c62a7df00541c87aca80 /compiler/test/dotc/tests.scala
parent66a340937b0adead0aa7a96e21f68d43a03cba00 (diff)
downloaddotty-d81fbda457620e5a117490684b21be253e992fa5.tar.gz
dotty-d81fbda457620e5a117490684b21be253e992fa5.tar.bz2
dotty-d81fbda457620e5a117490684b21be253e992fa5.zip
Remove whitelist and keep only blacklist.
Now that that the blacklist is fully know and is small enough, it will be simpler to maintain only the blacklist.
Diffstat (limited to 'compiler/test/dotc/tests.scala')
-rw-r--r--compiler/test/dotc/tests.scala31
1 files changed, 7 insertions, 24 deletions
diff --git a/compiler/test/dotc/tests.scala b/compiler/test/dotc/tests.scala
index c098aee33..786bac483 100644
--- a/compiler/test/dotc/tests.scala
+++ b/compiler/test/dotc/tests.scala
@@ -205,33 +205,16 @@ class tests extends CompilerTest {
private val stdlibFiles: List[String] = StdLibSources.whitelisted
@Test def checkWBLists = {
- import StdLibSources.{whitelistFile, blacklistFile}
-
val stdlibFilesBlackListed = StdLibSources.blacklisted
- def checkForRepeated(list: List[String], listFile: String) = {
- val duplicates = list.groupBy(x => x).filter(_._2.size > 1).filter(_._2.size > 1)
- val msg = duplicates.map(x => s"'${x._1}' appears ${x._2.size} times").mkString(s"Duplicate entries in $listFile:\n", "\n", "\n")
- assertTrue(msg, duplicates.isEmpty)
- }
- checkForRepeated(stdlibFiles, whitelistFile)
- checkForRepeated(stdlibFilesBlackListed, blacklistFile)
-
- val whitelistSet = stdlibFiles.toSet
- val blacklistSet = stdlibFilesBlackListed.toSet
-
- val intersection = whitelistSet.intersect(blacklistSet)
- val msgIntersection =
- intersection.map(x => s"'$x'").mkString(s"Entries where found in both $whitelistFile and $blacklistFile:\n", "\n", "\n")
- assertTrue(msgIntersection, intersection.isEmpty)
-
- val filesInStdLib = StdLibSources.all
- val missingFiles = filesInStdLib.toSet -- whitelistSet -- blacklistSet
- val msgMissing =
- missingFiles.map(x => s"'$x'").mkString(s"Entries are missing in $whitelistFile or $blacklistFile:\n", "\n", "\n")
- assertTrue(msgMissing, missingFiles.isEmpty)
- }
+ val duplicates = stdlibFilesBlackListed.groupBy(x => x).filter(_._2.size > 1).filter(_._2.size > 1)
+ val msg = duplicates.map(x => s"'${x._1}' appears ${x._2.size} times").mkString(s"Duplicate entries in ${StdLibSources.blacklistFile}:\n", "\n", "\n")
+ assertTrue(msg, duplicates.isEmpty)
+ val filesNotInStdLib = stdlibFilesBlackListed.toSet -- StdLibSources.all
+ val msg2 = filesNotInStdLib.map(x => s"'$x'").mkString(s"Entries in ${StdLibSources.blacklistFile} where not found:\n", "\n", "\n")
+ assertTrue(msg2, filesNotInStdLib.isEmpty)
+ }
@Test def compileStdLib = compileList("compileStdLib", stdlibFiles, "-migration" :: "-Yno-inline" :: scala2mode)
@Test def compileMixed = compileLine(