aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorodersky <odersky@gmail.com>2015-07-06 19:01:45 +0200
committerodersky <odersky@gmail.com>2015-07-06 19:01:45 +0200
commitb82313268b912c62f9ddc89fefd02be96f2de64c (patch)
treea1f2b2de5751b169558c5a11532ce37bf33f24ad /test
parent6561d4cadc2e1af354486c34817b86131ffbe1e7 (diff)
parentc7cc6d851b660c97e80cda806bf5366200c8836b (diff)
downloaddotty-b82313268b912c62f9ddc89fefd02be96f2de64c.tar.gz
dotty-b82313268b912c62f9ddc89fefd02be96f2de64c.tar.bz2
dotty-b82313268b912c62f9ddc89fefd02be96f2de64c.zip
Merge pull request #708 from dotty-staging/add/check-reentrant
Check that dotty is reentrant
Diffstat (limited to 'test')
-rw-r--r--test/dotc/tests.scala2
-rw-r--r--test/dotty/partest/DPConfig.scala2
-rw-r--r--test/dotty/partest/DPDirectCompiler.scala2
3 files changed, 3 insertions, 3 deletions
diff --git a/test/dotc/tests.scala b/test/dotc/tests.scala
index 3bce26253..2baeeb49e 100644
--- a/test/dotc/tests.scala
+++ b/test/dotc/tests.scala
@@ -147,7 +147,7 @@ class tests extends CompilerTest {
@Test def run_all = runFiles(runDir)
- @Test def dotty = compileDir(dottyDir, "tools", "-deep" :: allowDeepSubtypes ++ twice) // note the -deep argument
+ @Test def dotty = compileDir(dottyDir, "tools", "-deep" :: "-Ycheck-reentrant" :: allowDeepSubtypes ++ twice) // note the -deep argument
@Test def dotc_ast = compileDir(dotcDir, "ast")
diff --git a/test/dotty/partest/DPConfig.scala b/test/dotty/partest/DPConfig.scala
index 640dfd021..12453b450 100644
--- a/test/dotty/partest/DPConfig.scala
+++ b/test/dotty/partest/DPConfig.scala
@@ -28,5 +28,5 @@ object DPConfig {
// Tests finish faster when running in parallel, but console output is
// out of order and sometimes the compiler crashes
- val runTestsInParallel = false
+ val runTestsInParallel = true
}
diff --git a/test/dotty/partest/DPDirectCompiler.scala b/test/dotty/partest/DPDirectCompiler.scala
index 885de8c62..c05357edb 100644
--- a/test/dotty/partest/DPDirectCompiler.scala
+++ b/test/dotty/partest/DPDirectCompiler.scala
@@ -13,7 +13,7 @@ class DPDirectCompiler(runner: DPTestRunner) extends nest.DirectCompiler(runner)
val clogWriter = new PrintWriter(clogFWriter, true)
clogWriter.println("\ncompiling " + sources.mkString(" ") + "\noptions: " + opts0.mkString(" "))
- implicit var ctx: dotty.tools.dotc.core.Contexts.Context = {
+ implicit val ctx: dotty.tools.dotc.core.Contexts.Context = {
val base = new dotty.tools.dotc.core.Contexts.ContextBase
import base.settings._
val ctx = base.initialCtx.fresh.setSetting(printtypes, true)