aboutsummaryrefslogtreecommitdiff
path: root/test/dotc/tests.scala
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2015-05-11 11:37:12 +0200
committerMartin Odersky <odersky@gmail.com>2015-05-11 11:37:12 +0200
commitbe0bcc7c675d8b70c9414eadd5a47c3f11ae5243 (patch)
tree5862e48cc3f1da5dfbb8efc14598d0da406e9e32 /test/dotc/tests.scala
parent258775ecb01060397bb47c9ebc35945a87915451 (diff)
downloaddotty-be0bcc7c675d8b70c9414eadd5a47c3f11ae5243.tar.gz
dotty-be0bcc7c675d8b70c9414eadd5a47c3f11ae5243.tar.bz2
dotty-be0bcc7c675d8b70c9414eadd5a47c3f11ae5243.zip
Re-enable tests
Most tests were still commented out in last merge. Also, an outdated comment in TreeTypeMap was removed.
Diffstat (limited to 'test/dotc/tests.scala')
-rw-r--r--test/dotc/tests.scala8
1 files changed, 4 insertions, 4 deletions
diff --git a/test/dotc/tests.scala b/test/dotc/tests.scala
index 512cad90e..61ebae609 100644
--- a/test/dotc/tests.scala
+++ b/test/dotc/tests.scala
@@ -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)
@@ -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
@@ -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")
}