@@ -27,6 +27,7 @@ class tests extends CompilerTest {
27
27
val twice = List (" #runs" , " 2" , " -YnoDoubleBindings" )
28
28
29
29
val allowDeepSubtypes = defaultOptions diff List (" -Yno-deep-subtypes" )
30
+ val noPickling = allowDeepSubtypes ++ List (" -Yskip:pickler" )
30
31
31
32
val posDir = " ./tests/pos/"
32
33
val posSpecialDir = " ./tests/pos-special/"
@@ -51,7 +52,7 @@ class tests extends CompilerTest {
51
52
@ Test def pos_nameddefaults () = compileFile(posDir, " nameddefaults" )
52
53
@ Test def pos_desugar () = compileFile(posDir, " desugar" )
53
54
@ Test def pos_sigs () = compileFile(posDir, " sigs" )
54
- @ Test def pos_typers () = compileFile(posDir, " typers" )
55
+ @ Test def pos_typers () = compileFile(posDir, " typers" )(noPickling)
55
56
@ Test def pos_typedidents () = compileFile(posDir, " typedIdents" )
56
57
@ Test def pos_assignments () = compileFile(posDir, " assignments" )
57
58
@ Test def pos_packageobject () = compileFile(posDir, " packageobject" )
@@ -61,14 +62,14 @@ class tests extends CompilerTest {
61
62
@ Test def pos_templateParents () = compileFile(posDir, " templateParents" )
62
63
@ Test def pos_overloadedAccess = compileFile(posDir, " overloadedAccess" )
63
64
@ Test def pos_approximateUnion = compileFile(posDir, " approximateUnion" )
64
- @ Test def pos_tailcall = compileDir(posDir + " tailcall/" )
65
+ @ Test def pos_tailcall = compileDir(posDir + " tailcall/" )(noPickling)
65
66
@ Test def pos_nullarify = compileFile(posDir, " nullarify" , " -Ycheck:nullarify" :: Nil )
66
67
@ Test def pos_subtyping = compileFile(posDir, " subtyping" )
67
68
@ Test def pos_t2613 = compileFile(posSpecialDir, " t2613" )(allowDeepSubtypes)
68
69
@ Test def pos_packageObj = compileFile(posDir, " i0239" )
69
70
@ Test def pos_anonClassSubtyping = compileFile(posDir, " anonClassSubtyping" )
70
71
71
- @ Test def pos_all = compileFiles(posDir, failedOther)
72
+ @ Test def pos_all = compileFiles(posDir, failedOther)(noPickling)
72
73
73
74
@ Test def new_all = compileFiles(newDir, twice)
74
75
@@ -116,21 +117,21 @@ class tests extends CompilerTest {
116
117
@ Test def neg_escapingRefs = compileFile(negDir, " escapingRefs" , xerrors = 2 )
117
118
118
119
@ Test def dotc = compileDir(dotcDir + " tools/dotc" , failedOther)(allowDeepSubtypes)
119
- @ Test def dotc_ast = compileDir(dotcDir + " tools/dotc/ast" , failedOther) // similar to dotc_config
120
+ @ Test def dotc_ast = compileDir(dotcDir + " tools/dotc/ast" , failedOther)(noPickling) // similar to dotc_config
120
121
@ Test def dotc_config = compileDir(dotcDir + " tools/dotc/config" , failedOther) // seems to mess up stack frames
121
- @ Test def dotc_core = compileDir(dotcDir + " tools/dotc/core" , failedUnderscore)(allowDeepSubtypes )
122
+ @ Test def dotc_core = compileDir(dotcDir + " tools/dotc/core" , failedUnderscore)(noPickling )
122
123
// fails due to This refference to a non-eclosing class. Need to check
123
124
124
- @ Test def dotc_core_pickling = compileDir(dotcDir + " tools/dotc/core/pickling" , failedOther)(allowDeepSubtypes ) // Cannot emit primitive conversion from V to Z
125
+ @ Test def dotc_core_pickling = compileDir(dotcDir + " tools/dotc/core/pickling" , failedOther)(noPickling ) // Cannot emit primitive conversion from V to Z
125
126
126
- @ Test def dotc_transform = compileDir(dotcDir + " tools/dotc/transform" , failedbyName)
127
+ @ Test def dotc_transform = compileDir(dotcDir + " tools/dotc/transform" , failedbyName)(noPickling)
127
128
128
129
@ Test def dotc_parsing = compileDir(dotcDir + " tools/dotc/parsing" , failedOther)
129
130
// Expected primitive types I - Ljava/lang/Object
130
131
// Tried to return an object where expected type was Integer
131
132
@ Test def dotc_printing = compileDir(dotcDir + " tools/dotc/printing" , twice)
132
133
@ Test def dotc_reporting = compileDir(dotcDir + " tools/dotc/reporting" , twice)
133
- @ Test def dotc_typer = compileDir(dotcDir + " tools/dotc/typer" , failedOther) // similar to dotc_config
134
+ @ Test def dotc_typer = compileDir(dotcDir + " tools/dotc/typer" , failedOther)(noPickling) // similar to dotc_config
134
135
// @Test def dotc_util = compileDir(dotcDir + "tools/dotc/util") //fails inside ExtensionMethods with ClassCastException
135
136
@ Test def tools_io = compileDir(dotcDir + " tools/io" , failedOther) // similar to dotc_config
136
137
@@ -143,7 +144,7 @@ class tests extends CompilerTest {
143
144
dotcDir + " tools/dotc/core/Types.scala" ,
144
145
dotcDir + " tools/dotc/ast/Trees.scala" ,
145
146
failedUnderscore.head,
146
- " -Xprompt" ,
147
+ " -Xprompt" , " -Yskip:pickler " ,
147
148
" #runs" , " 2" ))
148
149
149
150
@ Test def testIssue_34 = compileArgs(Array (
0 commit comments