Skip to content

Commit cedf12b

Browse files
committed
Cleanup tests.
1 parent 7121ff3 commit cedf12b

File tree

1 file changed

+6
-11
lines changed

1 file changed

+6
-11
lines changed

test/dotc/tests.scala

Lines changed: 6 additions & 11 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

@@ -100,30 +102,23 @@ class tests extends CompilerTest {
100102
@Test def neg_badAuxConstr = compileFile(negDir, "badAuxConstr", xerrors = 2)
101103
@Test def neg_typetest = compileFile(negDir, "typetest", xerrors = 1)
102104

103-
@Test def dotc = compileDir(dotcDir + "tools/dotc", twice)
105+
@Test def dotc = compileDir(dotcDir + "tools/dotc", twice)(allowDeepSubtypes)
104106
@Test def dotc_ast = compileDir(dotcDir + "tools/dotc/ast", twice)
105107
@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)
108+
@Test def dotc_core = compileDir(dotcDir + "tools/dotc/core", twice)(allowDeepSubtypes)
109+
@Test def dotc_core_pickling = compileDir(dotcDir + "tools/dotc/core/pickling", twice)(allowDeepSubtypes)
110110

111111
@Test def dotc_transform = compileDir(dotcDir + "tools/dotc/transform", twice)
112-
// @odersky, fails with datarace (fixed)
113-
// now fails with unapplied setter generated by pattern matcher:
114-
// at PatternMatcher.scala:363: missing arguments for setter altss_= in class AlternativesTreeMaker
115112

116113
@Test def dotc_parsing = compileDir(dotcDir + "tools/dotc/parsing", twice)
117114
@Test def dotc_printing = compileDir(dotcDir + "tools/dotc/printing", twice)
118-
// @odersky, elimByName creates symbol with incorrect owner (fixed)
119115

120116
@Test def dotc_reporting = compileDir(dotcDir + "tools/dotc/reporting", twice)
121117
@Test def dotc_typer = compileDir(dotcDir + "tools/dotc/typer", twice)
122-
// @odersky, elimByName creates symbol with incorrect owner (fixed)
123118

124119
@Test def dotc_util = compileDir(dotcDir + "tools/dotc/util", twice)
125120
@Test def tools_io = compileDir(dotcDir + "tools/io", twice)
126-
@Test def tools = compileDir(dotcDir + "tools", twice)
121+
@Test def tools = compileDir(dotcDir + "tools", twice)(allowDeepSubtypes)
127122

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

0 commit comments

Comments
 (0)