Skip to content

Commit 3bca302

Browse files
committed
Cleanup tests.
1 parent b288948 commit 3bca302

File tree

1 file changed

+6
-17
lines changed

1 file changed

+6
-17
lines changed

test/dotc/tests.scala

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ class tests extends CompilerTest {
2020
/*,"-uniqid", "-explaintypes", "-verbose", "-Ylog:splitter", "-Xprompt", "-YnoDoubleBindings"*/
2121
)
2222

23+
val allowDeepSubtypes = defaultOptions diff List("-YnoDeepSubtypes")
24+
2325
val twice = List("#runs", "2", "-YnoDoubleBindings", "-Ystop-before:terminal")
2426
val doErase = List("-Ystop-before:terminal")
2527

@@ -99,32 +101,19 @@ class tests extends CompilerTest {
99101
@Test def neg_variances = compileFile(negDir, "variances", xerrors = 2)
100102
@Test def neg_badAuxConstr = compileFile(negDir, "badAuxConstr", xerrors = 2)
101103
@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)
104105
@Test def dotc_ast = compileDir(dotcDir + "tools/dotc/ast", twice)
105106
@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)
111109
@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-
117110
@Test def dotc_parsing = compileDir(dotcDir + "tools/dotc/parsing", twice)
118111
@Test def dotc_printing = compileDir(dotcDir + "tools/dotc/printing", twice)
119-
// @odersky, elimByName creates symbol with incorrect owner (fixed)
120-
121112
@Test def dotc_reporting = compileDir(dotcDir + "tools/dotc/reporting", twice)
122113
@Test def dotc_typer = compileDir(dotcDir + "tools/dotc/typer", twice)
123-
// @odersky, elimByName creates symbol with incorrect owner (fixed)
124-
125114
@Test def dotc_util = compileDir(dotcDir + "tools/dotc/util", twice)
126115
@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)
128117

129118
@Test def testNonCyclic = compileArgs(Array(
130119
dotcDir + "tools/dotc/CompilationUnit.scala",

0 commit comments

Comments
 (0)