diff options
author | Felix Mulder <felix.mulder@gmail.com> | 2016-10-13 14:59:29 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-13 14:59:29 +0200 |
commit | dac5b931bcf8757070c8aa74571e52f3b4c6e5eb (patch) | |
tree | 99e7b71c0870aabe303710f2d9520ceb80f54ae7 /test/dotc/tests.scala | |
parent | a90a7845ef5fb44d842dc316de2c4fdc52946b41 (diff) | |
parent | 92ebb46afedaba26dff0f579b78c704e7ded4b96 (diff) | |
download | dotty-dac5b931bcf8757070c8aa74571e52f3b4c6e5eb.tar.gz dotty-dac5b931bcf8757070c8aa74571e52f3b4c6e5eb.tar.bz2 dotty-dac5b931bcf8757070c8aa74571e52f3b4c6e5eb.zip |
Merge pull request #1427 from dotty-staging/fix-i1274
fix #1274: test for dotty bootstrap based on tasty
Diffstat (limited to 'test/dotc/tests.scala')
-rw-r--r-- | test/dotc/tests.scala | 46 |
1 files changed, 35 insertions, 11 deletions
diff --git a/test/dotc/tests.scala b/test/dotc/tests.scala index 39e5f5ead..94b74d786 100644 --- a/test/dotc/tests.scala +++ b/test/dotc/tests.scala @@ -1,10 +1,9 @@ package dotc import test._ -import dotty.partest._ -import org.junit.Test -import org.junit.experimental.categories._ +import org.junit.{Before, Test} +import scala.reflect.io.Directory import scala.io.Source // tests that match regex '(pos|dotc|run|java|compileStdLib)\.*' would be executed as benchmarks. @@ -12,22 +11,22 @@ class tests extends CompilerTest { def isRunByJenkins: Boolean = sys.props.isDefinedAt("dotty.jenkins.build") + val defaultOutputDir = "./out/" + val noCheckOptions = List( // "-verbose", // "-Ylog:frontend", // "-Xprompt", // "-explaintypes", // "-Yshow-suppressed-errors", + "-d", defaultOutputDir, "-pagewidth", "160") - val defaultOutputDir = "./out/" - - implicit val defaultOptions = noCheckOptions ++ List( - "-Yno-deep-subtypes", "-Yno-double-bindings", "-Yforce-sbt-phases", "-color:never", - "-d", defaultOutputDir) ++ { - if (isRunByJenkins) List("-Ycheck:tailrec,resolveSuper,mixin,restoreScopes,labelDef") // should be Ycheck:all, but #725 - else List("-Ycheck:tailrec,resolveSuper,mixin,restoreScopes,labelDef") - } + implicit val defaultOptions = noCheckOptions ++ + List("-Yno-deep-subtypes", "-Yno-double-bindings", "-Yforce-sbt-phases", "-color:never") ++ { + if (isRunByJenkins) List("-Ycheck:tailrec,resolveSuper,mixin,restoreScopes,labelDef") // should be Ycheck:all, but #725 + else List("-Ycheck:tailrec,resolveSuper,mixin,restoreScopes,labelDef") + } val testPickling = List("-Xprint-types", "-Ytest-pickler", "-Ystop-after:pickler") @@ -60,6 +59,12 @@ class tests extends CompilerTest { val dottyReplDir = dotcDir + "repl/" val typerDir = dotcDir + "typer/" + @Before def cleanup(): Unit = { + // remove class files from stdlib and tests compilation + Directory(defaultOutputDir + "scala").deleteRecursively() + Directory(defaultOutputDir + "java").deleteRecursively() + } + @Test def pickle_pickleOK = compileDir(testsDir, "pickling", testPickling) // This directory doesn't exist anymore // @Test def pickle_pickling = compileDir(coreDir, "pickling", testPickling) @@ -301,4 +306,23 @@ class tests extends CompilerTest { @Test def tasty_dotc_util = compileDir(dotcDir, "util", testPickling) @Test def tasty_tools_io = compileDir(toolsDir, "io", testPickling) @Test def tasty_tests = compileDir(testsDir, "tasty", testPickling) + + @Test def tasty_bootstrap = { + val opt = List("-priorityclasspath", defaultOutputDir, "-Ylog-classpath") + // first compile dotty + compileDir(dottyDir, ".", List("-deep", "-Ycheck-reentrant", "-strict"))(allowDeepSubtypes) + + compileDir(dottyDir, "tools", opt) + compileDir(toolsDir, "dotc", opt) + compileDir(dotcDir, "ast", opt) + compileDir(dotcDir, "config", opt) + compileDir(dotcDir, "parsing", opt) + compileDir(dotcDir, "printing", opt) + compileDir(dotcDir, "repl", opt) + compileDir(dotcDir, "reporting", opt) + compileDir(dotcDir, "rewrite", opt) + compileDir(dotcDir, "transform", opt) + compileDir(dotcDir, "typer", opt) + compileDir(dotcDir, "util", opt) + } } |