Skip to content

Re-enable tests #555

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 11, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/dotty/tools/dotc/ast/TreeTypeMap.scala
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ import dotty.tools.dotc.transform.SymUtils._
* @param typeMap A function from Type to Type that gets applied to the
* type of every tree node and to all locally defined symbols,
* followed by the substitution [substFrom := substTo].
* @param ownerMap A function that translates owners of top-level local symbols
* defined in the mapped tree.
* @param treeMap A transformer that translates all encountered subtrees in
* prefix traversal orders
* @param oldOwners Previous owners. If a top-level local symbol in the mapped tree
Expand Down
8 changes: 4 additions & 4 deletions test/dotc/tests.scala
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class tests extends CompilerTest {
val toolsDir = dottyDir + "tools/"
val dotcDir = toolsDir + "dotc/"
val coreDir = dotcDir + "core/"
/*

@Test def pickle_pickleOK = compileDir(testsDir, "pickling", testPickling)
@Test def pickle_pickling = compileDir(coreDir, "pickling", testPickling)
@Test def pickle_ast = compileDir(dotcDir, "ast", testPickling)
Expand Down Expand Up @@ -135,9 +135,9 @@ class tests extends CompilerTest {
@Test def neg_escapingRefs = compileFile(negDir, "escapingRefs", xerrors = 2)
@Test def neg_instantiateAbstract = compileFile(negDir, "instantiateAbstract", xerrors = 8)
@Test def neg_selfInheritance = compileFile(negDir, "selfInheritance", xerrors = 5)
*/

@Test def dotty = compileDir(toolsDir, "", "-deep" :: allowDeepSubtypes ++ twice) // note the -deep argument
/*

@Test def dotc_ast = compileDir(dotcDir, "ast")
@Test def dotc_config = compileDir(dotcDir, "config")
@Test def dotc_core = compileDir(dotcDir, "core")("-Yno-double-bindings" :: allowDeepSubtypes)// twice omitted to make tests run faster
Expand Down Expand Up @@ -178,6 +178,6 @@ class tests extends CompilerTest {
), List(/* "-Ylog:frontend", */ "-Xprompt") ++ staleSymbolError ++ twice)

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