summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/interpreter/IMain.scala
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2011-06-10 17:32:05 +0000
committerPaul Phillips <paulp@improving.org>2011-06-10 17:32:05 +0000
commit4e85b6fb33baad9910b3d776867dc16c2816acdf (patch)
treee92d9829e239cb1744f688a7831d3f83c291fc8b /src/compiler/scala/tools/nsc/interpreter/IMain.scala
parent07fab88cee34e5f59cf88f0dc8e61f2b8817eb24 (diff)
downloadscala-4e85b6fb33baad9910b3d776867dc16c2816acdf.tar.gz
scala-4e85b6fb33baad9910b3d776867dc16c2816acdf.tar.bz2
scala-4e85b6fb33baad9910b3d776867dc16c2816acdf.zip
Tweaks repl tests to enforce -Yrepl-sync and ot...
Tweaks repl tests to enforce -Yrepl-sync and other setup on all clients. Also includes some more why-do-tests-hang bosons for the particle accelerator in case that doesn't wrap it up. I think it will though, because now constrained-types is the only one which failed and it's also the only one which overrides Settings. No review.
Diffstat (limited to 'src/compiler/scala/tools/nsc/interpreter/IMain.scala')
-rw-r--r--src/compiler/scala/tools/nsc/interpreter/IMain.scala4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/interpreter/IMain.scala b/src/compiler/scala/tools/nsc/interpreter/IMain.scala
index 5c8679a93c..11ab21e952 100644
--- a/src/compiler/scala/tools/nsc/interpreter/IMain.scala
+++ b/src/compiler/scala/tools/nsc/interpreter/IMain.scala
@@ -129,8 +129,10 @@ class IMain(val settings: Settings, protected val out: JPrintWriter) extends Imp
}
}
def initializeSynchronous(): Unit = {
- if (!isInitializeComplete)
+ if (!isInitializeComplete) {
_initialize()
+ assert(global != null, global)
+ }
}
def isInitializeComplete = _initializeComplete