Skip to content

Commit c80b04d

Browse files
committed
Merge pull request #555 from dotty-staging/fix/reenable-tests
Re-enable tests
2 parents 258775e + be0bcc7 commit c80b04d

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

src/dotty/tools/dotc/ast/TreeTypeMap.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ import dotty.tools.dotc.transform.SymUtils._
1313
* @param typeMap A function from Type to Type that gets applied to the
1414
* type of every tree node and to all locally defined symbols,
1515
* followed by the substitution [substFrom := substTo].
16-
* @param ownerMap A function that translates owners of top-level local symbols
17-
* defined in the mapped tree.
1816
* @param treeMap A transformer that translates all encountered subtrees in
1917
* prefix traversal orders
2018
* @param oldOwners Previous owners. If a top-level local symbol in the mapped tree

test/dotc/tests.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class tests extends CompilerTest {
4242
val toolsDir = dottyDir + "tools/"
4343
val dotcDir = toolsDir + "dotc/"
4444
val coreDir = dotcDir + "core/"
45-
/*
45+
4646
@Test def pickle_pickleOK = compileDir(testsDir, "pickling", testPickling)
4747
@Test def pickle_pickling = compileDir(coreDir, "pickling", testPickling)
4848
@Test def pickle_ast = compileDir(dotcDir, "ast", testPickling)
@@ -135,9 +135,9 @@ class tests extends CompilerTest {
135135
@Test def neg_escapingRefs = compileFile(negDir, "escapingRefs", xerrors = 2)
136136
@Test def neg_instantiateAbstract = compileFile(negDir, "instantiateAbstract", xerrors = 8)
137137
@Test def neg_selfInheritance = compileFile(negDir, "selfInheritance", xerrors = 5)
138-
*/
138+
139139
@Test def dotty = compileDir(toolsDir, "", "-deep" :: allowDeepSubtypes ++ twice) // note the -deep argument
140-
/*
140+
141141
@Test def dotc_ast = compileDir(dotcDir, "ast")
142142
@Test def dotc_config = compileDir(dotcDir, "config")
143143
@Test def dotc_core = compileDir(dotcDir, "core")("-Yno-double-bindings" :: allowDeepSubtypes)// twice omitted to make tests run faster
@@ -178,6 +178,6 @@ class tests extends CompilerTest {
178178
), List(/* "-Ylog:frontend", */ "-Xprompt") ++ staleSymbolError ++ twice)
179179

180180
val javaDir = "./tests/pos/java-interop/"
181-
@Test def java_all = compileFiles(javaDir, twice)*/
181+
@Test def java_all = compileFiles(javaDir, twice)
182182
//@Test def dotc_compilercommand = compileFile(dotcDir + "config/", "CompilerCommand")
183183
}

0 commit comments

Comments
 (0)