diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/dotc/build.scala | 2 | ||||
| -rw-r--r-- | test/dotc/tests.scala | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/test/dotc/build.scala b/test/dotc/build.scala index 9f47796c3..2963b8f1e 100644 --- a/test/dotc/build.scala +++ b/test/dotc/build.scala @@ -21,6 +21,8 @@ object build extends tests { def main(args: Array[String]): Unit = { println("------------ Building dotty ------------") deleteFilesInFolder(new File(defaultOutputDir)) // clear previous output + val keepFile = new File(defaultOutputDir + ".keep") + keepFile.createNewFile() dotty // build output dir val p = Runtime.getRuntime.exec(Array("jar", "cf", "dotty.jar", "-C", "out", ".")) p.waitFor() diff --git a/test/dotc/tests.scala b/test/dotc/tests.scala index 700dcd494..deea12272 100644 --- a/test/dotc/tests.scala +++ b/test/dotc/tests.scala @@ -77,7 +77,7 @@ class tests extends CompilerTest { @Test def pos_desugar() = compileFile(posDir, "desugar", twice) @Test def pos_sigs() = compileFile(posDir, "sigs", twice) @Test def pos_typers() = compileFile(posDir, "typers", twice) - @Test def pos_typedidents() = compileFile(posDir, "typedIdents", twice) + @Test def pos_typedIdents() = compileDir(posDir, "typedIdents", twice) @Test def pos_assignments() = compileFile(posDir, "assignments", twice) @Test def pos_packageobject() = compileFile(posDir, "packageobject", twice) @Test def pos_overloaded() = compileFile(posDir, "overloaded", twice) @@ -103,14 +103,14 @@ class tests extends CompilerTest { @Test def neg_abstractOverride() = compileFile(negDir, "abstract-override", xerrors = 2) @Test def neg_blockescapes() = compileFile(negDir, "blockescapesNeg", xerrors = 1) @Test def neg_typedapply() = compileFile(negDir, "typedapply", xerrors = 4) - @Test def neg_typedidents() = compileFile(negDir, "typedIdents", xerrors = 2) + @Test def neg_typedIdents() = compileDir(negDir, "typedIdents", xerrors = 2) @Test def neg_assignments() = compileFile(negDir, "assignments", xerrors = 3) @Test def neg_typers() = compileFile(negDir, "typers", xerrors = 14)(allowDoubleBindings) @Test def neg_privates() = compileFile(negDir, "privates", xerrors = 2) @Test def neg_rootImports = compileFile(negDir, "rootImplicits", xerrors = 2) @Test def neg_templateParents() = compileFile(negDir, "templateParents", xerrors = 3) - @Test def neg_autoTupling = compileFile(posDir, "autoTuplingTest", args = "-language:noAutoTupling" :: Nil, xerrors = 4) - @Test def neg_autoTupling2 = compileFile(negDir, "autoTuplingTest", xerrors = 4) + @Test def neg_autoTupling = compileFile(posDir, "autoTuplingTest", args = "-language:noAutoTupling" :: Nil, xerrors = 3) + @Test def neg_autoTupling2 = compileFile(negDir, "autoTuplingTest", xerrors = 3) @Test def neg_companions = compileFile(negDir, "companions", xerrors = 1) @Test def neg_over = compileFile(negDir, "over", xerrors = 3) @Test def neg_overrides = compileFile(negDir, "overrides", xerrors = 11) @@ -145,6 +145,7 @@ class tests extends CompilerTest { @Test def neg_i583 = compileFile(negDir, "i0583-skolemize", xerrors = 2) @Test def neg_finalSealed = compileFile(negDir, "final-sealed", xerrors = 2) @Test def neg_i705 = compileFile(negDir, "i705-inner-value-class", xerrors = 7) + @Test def neg_i866 = compileFile(negDir, "i866", xerrors = 2) @Test def neg_moduleSubtyping = compileFile(negDir, "moduleSubtyping", xerrors = 4) @Test def neg_escapingRefs = compileFile(negDir, "escapingRefs", xerrors = 2) @Test def neg_instantiateAbstract = compileFile(negDir, "instantiateAbstract", xerrors = 8) |