Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test all pos & run tests with -Ytest-pickler #5059

Merged
merged 2 commits into from
Sep 4, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 70 additions & 0 deletions compiler/test/dotc/pos-test-pickling.blacklist
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
1567
depfuntype.scala
false-companion
i0881
i1137-1
i1137-2
i1137-3
i1500.scala
i1753.scala
i1812.scala
i1867.scala
i2551
i2797a
i3067.scala
i3130b.scala
i3149.scala
i3422
i3467
i3542-1.scala
i3585.scala
i3692.scala
i3898
i3898b
i3898c
i3912-1
i3912-2
i3912-3
i3976.scala
i4023
i4023b
i4023c
i4125.scala
i4167
i4586.scala
i4734
implicit-dep.scala
inline-access-levels
macro-with-array
macro-with-type
phantom-Eq2
power-macro
quote-lift-inline-params
quote-nested-object
scala2traits
sepComp
seqtype-cycle
t1029
t1942
t247.scala
t2712-5.scala
t2726
t2741
t284-pos.scala
t3249
t3419
t3452f.scala
t3486
t3612.scala
t3864
t3999
t4757
t5013
t5031_3
t5504
t6028
t6976
t7264
t7532b
t8062
typeclass-encoding2.scala
84 changes: 84 additions & 0 deletions compiler/test/dotc/run-test-pickling.blacklist
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
colltest4
colltest5
colltest6
Course-2002-07.scala
eff-dependent.scala
i1140
i1144
i4431
i4455
i4492
i4496b.scala
i4515
i4515b
i4734
i4735
i4803
i4803b
i4803c
i4803d
i4803e
i4803f
i4947b
implicitMatch.scala
implicitShortcut
lazy-implicit-lists.scala
lazy-implicit-nums.scala
lazy-traits.scala
lst
mixins1
outerPatternMatch
paramForwarding_separate
quote-and-splice
quote-force
quote-indexed-map-by-name
quote-sep-comp
quote-sep-comp-2
quote-simple-macro
quote-unrolled-foreach
reduce-projections.scala
t1500c.scala
t3038c
t3452a
t3452b
t3452b-bcode
t3452d
t3452e
t3452g
t4317
t7120
t7374
t7859
t8133
t8133b
tasty-custom-show
tasty-definitions-1
tasty-definitions-2
tasty-definitions-3
tasty-eval
tasty-extractors-1
tasty-extractors-2
tasty-extractors-3
tasty-extractors-constants-1
tasty-extractors-owners
tasty-extractors-types
tasty-getfile
tasty-indexed-map
tasty-linenumber
tasty-linenumber-2
tasty-location
tasty-macro-assert
tasty-positioned
tasty-subtyping
transparent
transparentAccess
transparentByName.scala
transparentForeach.scala
transparentPower
Tuple.scala
TupleAbstract.scala
typelevel-numeric.scala
typelevel-patmat.scala
typelevel.scala
typelevel1.scala
typelevel3.scala
6 changes: 5 additions & 1 deletion compiler/test/dotty/tools/TestSources.scala
Original file line number Diff line number Diff line change
Expand Up @@ -29,20 +29,24 @@ object TestSources {
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 posTestPicklingBlacklistFile: String = "compiler/test/dotc/pos-test-pickling.blacklist"

def posFromTastyBlacklisted: List[String] = loadList(posFromTastyBlacklistFile)
def posDecompilationBlacklisted: List[String] = loadList(posDecompilationBlacklistFile)
def posRecompilationWhitelist: List[String] = loadList(posRecompilationWhitelistFile)
def posTestPicklingBlacklisted: List[String] = loadList(posTestPicklingBlacklistFile)

// 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 runTestPicklingBlacklistFile: String = "compiler/test/dotc/run-test-pickling.blacklist"

def runFromTastyBlacklisted: List[String] = loadList(runFromTastyBlacklistFile)
def runDecompilationBlacklisted: List[String] = loadList(runDecompilationBlacklistFile)
def runRecompilationWhitelist: List[String] = loadList(runRecompilationWhitelistFile)
def runTestPicklingBlacklisted: List[String] = loadList(runTestPicklingBlacklistFile)

// load lists

Expand All @@ -53,4 +57,4 @@ object TestSources {
.filter(_.nonEmpty)
.toList

}
}
3 changes: 2 additions & 1 deletion compiler/test/dotty/tools/dotc/CompilationTests.scala
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,8 @@ class CompilationTests extends ParallelTesting {
@Test def pickling: Unit = {
implicit val testGroup: TestGroup = TestGroup("testPickling")
compileFilesInDir("tests/new", picklingOptions) +
compileFilesInDir("tests/pickling", picklingOptions)
compileFilesInDir("tests/pos", picklingOptions, FileFilter.exclude(TestSources.posTestPicklingBlacklisted)) +
compileFilesInDir("tests/run", picklingOptions, FileFilter.exclude(TestSources.runTestPicklingBlacklisted))
}.checkCompile()

/** The purpose of this test is two-fold, being able to compile dotty
Expand Down
1 change: 1 addition & 0 deletions tests/pickling/annot.scala → tests/pending/annot-2.scala
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ class RefinedType extends Type
object TestAnnot {
def toText(tp: Type) = tp match {
case tp: RefinedType =>
// Doesn't Ycheck, see #5073
val parent :: (refined: List[RefinedType @unchecked]) = ???
???
}
Expand Down
59 changes: 0 additions & 59 deletions tests/pickling/Coder.scala

This file was deleted.

3 changes: 0 additions & 3 deletions tests/pickling/alias.scala

This file was deleted.

32 changes: 0 additions & 32 deletions tests/pickling/arrays2.scala

This file was deleted.

88 changes: 0 additions & 88 deletions tests/pickling/desugar.scala

This file was deleted.

Loading