@@ -20,6 +20,8 @@ class tests extends CompilerTest {
20
20
/* ,"-uniqid", "-explaintypes", "-verbose", "-Ylog:splitter", "-Xprompt", "-YnoDoubleBindings"*/
21
21
)
22
22
23
+ val allowDeepSubtypes = defaultOptions diff List (" -YnoDeepSubtypes" )
24
+
23
25
val twice = List (" #runs" , " 2" , " -YnoDoubleBindings" , " -Ystop-before:terminal" )
24
26
val doErase = List (" -Ystop-before:terminal" )
25
27
@@ -99,32 +101,19 @@ class tests extends CompilerTest {
99
101
@ Test def neg_variances = compileFile(negDir, " variances" , xerrors = 2 )
100
102
@ Test def neg_badAuxConstr = compileFile(negDir, " badAuxConstr" , xerrors = 2 )
101
103
@ Test def neg_typetest = compileFile(negDir, " typetest" , xerrors = 1 )
102
-
103
- @ Test def dotc = compileDir(dotcDir + " tools/dotc" , twice)
104
+ @ Test def dotc = compileDir(dotcDir + " tools/dotc" , twice)(allowDeepSubtypes)
104
105
@ Test def dotc_ast = compileDir(dotcDir + " tools/dotc/ast" , twice)
105
106
@ Test def dotc_config = compileDir(dotcDir + " tools/dotc/config" , twice)
106
- @ Test def dotc_core = compileDir(dotcDir + " tools/dotc/core" , twice)
107
- @ Test def dotc_core_pickling = compileDir(dotcDir + " tools/dotc/core/pickling" , twice)(
108
- defaultOptions diff List (" -YnoDeepSubtypes" ))
109
- // @odesky, fails on assertion in TypeComparer:425 (fixed)
110
-
107
+ @ Test def dotc_core = compileDir(dotcDir + " tools/dotc/core" , twice)(allowDeepSubtypes)
108
+ @ Test def dotc_core_pickling = compileDir(dotcDir + " tools/dotc/core/pickling" , twice)(allowDeepSubtypes)
111
109
@ Test def dotc_transform = compileDir(dotcDir + " tools/dotc/transform" , twice)
112
-
113
- // @odersky, fails with datarace (fixed)
114
- // now fails with unapplied setter generated by pattern matcher:
115
- // at PatternMatcher.scala:363: missing arguments for setter altss_= in class AlternativesTreeMaker
116
-
117
110
@ Test def dotc_parsing = compileDir(dotcDir + " tools/dotc/parsing" , twice)
118
111
@ Test def dotc_printing = compileDir(dotcDir + " tools/dotc/printing" , twice)
119
- // @odersky, elimByName creates symbol with incorrect owner (fixed)
120
-
121
112
@ Test def dotc_reporting = compileDir(dotcDir + " tools/dotc/reporting" , twice)
122
113
@ Test def dotc_typer = compileDir(dotcDir + " tools/dotc/typer" , twice)
123
- // @odersky, elimByName creates symbol with incorrect owner (fixed)
124
-
125
114
@ Test def dotc_util = compileDir(dotcDir + " tools/dotc/util" , twice)
126
115
@ Test def tools_io = compileDir(dotcDir + " tools/io" , twice)
127
- @ Test def tools = compileDir(dotcDir + " tools" , twice)
116
+ @ Test def tools = compileDir(dotcDir + " tools" , twice)(allowDeepSubtypes)
128
117
129
118
@ Test def testNonCyclic = compileArgs(Array (
130
119
dotcDir + " tools/dotc/CompilationUnit.scala" ,
0 commit comments