Skip to content

Commit 354611b

Browse files
Merge pull request #5059 from dotty-staging/black-test-pickler-tests
Test all pos & run tests with -Ytest-pickler
2 parents 86c4e72 + 72a17e9 commit 354611b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+162
-781
lines changed
Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
1567
2+
depfuntype.scala
3+
false-companion
4+
i0881
5+
i1137-1
6+
i1137-2
7+
i1137-3
8+
i1500.scala
9+
i1753.scala
10+
i1812.scala
11+
i1867.scala
12+
i2551
13+
i2797a
14+
i3067.scala
15+
i3130b.scala
16+
i3149.scala
17+
i3422
18+
i3467
19+
i3542-1.scala
20+
i3585.scala
21+
i3692.scala
22+
i3898
23+
i3898b
24+
i3898c
25+
i3912-1
26+
i3912-2
27+
i3912-3
28+
i3976.scala
29+
i4023
30+
i4023b
31+
i4023c
32+
i4125.scala
33+
i4167
34+
i4586.scala
35+
i4734
36+
implicit-dep.scala
37+
inline-access-levels
38+
macro-with-array
39+
macro-with-type
40+
phantom-Eq2
41+
power-macro
42+
quote-lift-inline-params
43+
quote-nested-object
44+
scala2traits
45+
sepComp
46+
seqtype-cycle
47+
t1029
48+
t1942
49+
t247.scala
50+
t2712-5.scala
51+
t2726
52+
t2741
53+
t284-pos.scala
54+
t3249
55+
t3419
56+
t3452f.scala
57+
t3486
58+
t3612.scala
59+
t3864
60+
t3999
61+
t4757
62+
t5013
63+
t5031_3
64+
t5504
65+
t6028
66+
t6976
67+
t7264
68+
t7532b
69+
t8062
70+
typeclass-encoding2.scala
Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
colltest4
2+
colltest5
3+
colltest6
4+
Course-2002-07.scala
5+
eff-dependent.scala
6+
i1140
7+
i1144
8+
i4431
9+
i4455
10+
i4492
11+
i4496b.scala
12+
i4515
13+
i4515b
14+
i4734
15+
i4735
16+
i4803
17+
i4803b
18+
i4803c
19+
i4803d
20+
i4803e
21+
i4803f
22+
i4947b
23+
implicitMatch.scala
24+
implicitShortcut
25+
lazy-implicit-lists.scala
26+
lazy-implicit-nums.scala
27+
lazy-traits.scala
28+
lst
29+
mixins1
30+
outerPatternMatch
31+
paramForwarding_separate
32+
quote-and-splice
33+
quote-force
34+
quote-indexed-map-by-name
35+
quote-sep-comp
36+
quote-sep-comp-2
37+
quote-simple-macro
38+
quote-unrolled-foreach
39+
reduce-projections.scala
40+
t1500c.scala
41+
t3038c
42+
t3452a
43+
t3452b
44+
t3452b-bcode
45+
t3452d
46+
t3452e
47+
t3452g
48+
t4317
49+
t7120
50+
t7374
51+
t7859
52+
t8133
53+
t8133b
54+
tasty-custom-show
55+
tasty-definitions-1
56+
tasty-definitions-2
57+
tasty-definitions-3
58+
tasty-eval
59+
tasty-extractors-1
60+
tasty-extractors-2
61+
tasty-extractors-3
62+
tasty-extractors-constants-1
63+
tasty-extractors-owners
64+
tasty-extractors-types
65+
tasty-getfile
66+
tasty-indexed-map
67+
tasty-linenumber
68+
tasty-linenumber-2
69+
tasty-location
70+
tasty-macro-assert
71+
tasty-positioned
72+
tasty-subtyping
73+
transparent
74+
transparentAccess
75+
transparentByName.scala
76+
transparentForeach.scala
77+
transparentPower
78+
Tuple.scala
79+
TupleAbstract.scala
80+
typelevel-numeric.scala
81+
typelevel-patmat.scala
82+
typelevel.scala
83+
typelevel1.scala
84+
typelevel3.scala

compiler/test/dotty/tools/TestSources.scala

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,20 +29,24 @@ object TestSources {
2929
def posFromTastyBlacklistFile: String = "compiler/test/dotc/pos-from-tasty.blacklist"
3030
def posDecompilationBlacklistFile: String = "compiler/test/dotc/pos-decompilation.blacklist"
3131
def posRecompilationWhitelistFile: String = "compiler/test/dotc/pos-recompilation.whitelist"
32+
def posTestPicklingBlacklistFile: String = "compiler/test/dotc/pos-test-pickling.blacklist"
3233

3334
def posFromTastyBlacklisted: List[String] = loadList(posFromTastyBlacklistFile)
3435
def posDecompilationBlacklisted: List[String] = loadList(posDecompilationBlacklistFile)
3536
def posRecompilationWhitelist: List[String] = loadList(posRecompilationWhitelistFile)
37+
def posTestPicklingBlacklisted: List[String] = loadList(posTestPicklingBlacklistFile)
3638

3739
// run tests lists
3840

3941
def runFromTastyBlacklistFile: String = "compiler/test/dotc/run-from-tasty.blacklist"
4042
def runDecompilationBlacklistFile: String = "compiler/test/dotc/run-decompilation.blacklist"
4143
def runRecompilationWhitelistFile: String = "compiler/test/dotc/run-recompilation.whitelist"
44+
def runTestPicklingBlacklistFile: String = "compiler/test/dotc/run-test-pickling.blacklist"
4245

4346
def runFromTastyBlacklisted: List[String] = loadList(runFromTastyBlacklistFile)
4447
def runDecompilationBlacklisted: List[String] = loadList(runDecompilationBlacklistFile)
4548
def runRecompilationWhitelist: List[String] = loadList(runRecompilationWhitelistFile)
49+
def runTestPicklingBlacklisted: List[String] = loadList(runTestPicklingBlacklistFile)
4650

4751
// load lists
4852

@@ -53,4 +57,4 @@ object TestSources {
5357
.filter(_.nonEmpty)
5458
.toList
5559

56-
}
60+
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,8 @@ class CompilationTests extends ParallelTesting {
183183
@Test def pickling: Unit = {
184184
implicit val testGroup: TestGroup = TestGroup("testPickling")
185185
compileFilesInDir("tests/new", picklingOptions) +
186-
compileFilesInDir("tests/pickling", picklingOptions)
186+
compileFilesInDir("tests/pos", picklingOptions, FileFilter.exclude(TestSources.posTestPicklingBlacklisted)) +
187+
compileFilesInDir("tests/run", picklingOptions, FileFilter.exclude(TestSources.runTestPicklingBlacklisted))
187188
}.checkCompile()
188189

189190
/** The purpose of this test is two-fold, being able to compile dotty

tests/pickling/annot.scala renamed to tests/pending/annot-2.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ class RefinedType extends Type
55
object TestAnnot {
66
def toText(tp: Type) = tp match {
77
case tp: RefinedType =>
8+
// Doesn't Ycheck, see #5073
89
val parent :: (refined: List[RefinedType @unchecked]) = ???
910
???
1011
}

tests/pickling/Coder.scala

Lines changed: 0 additions & 59 deletions
This file was deleted.

tests/pickling/alias.scala

Lines changed: 0 additions & 3 deletions
This file was deleted.

tests/pickling/arrays2.scala

Lines changed: 0 additions & 32 deletions
This file was deleted.

tests/pickling/desugar.scala

Lines changed: 0 additions & 88 deletions
This file was deleted.

0 commit comments

Comments
 (0)