diff options
| author | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2014-10-06 16:07:43 +0200 |
|---|---|---|
| committer | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2014-10-06 16:07:43 +0200 |
| commit | 830425a06ffaed5441a44edbb8018ec4e231d59d (patch) | |
| tree | 341045e4eff6e40bd70c47734c71d16f807085ea /src | |
| parent | bea10f23ef2840fa523392f553000a2ac4259cd9 (diff) | |
| parent | a9f4981fedd8cf563bed570853a822196ae30632 (diff) | |
| download | scala-830425a06ffaed5441a44edbb8018ec4e231d59d.tar.gz scala-830425a06ffaed5441a44edbb8018ec4e231d59d.tar.bz2 scala-830425a06ffaed5441a44edbb8018ec4e231d59d.zip | |
Merge pull request #4023 from retronym/topic/time-me-out
Increase REPL startup timeout to avoid test failures
Diffstat (limited to 'src')
| -rw-r--r-- | src/repl/scala/tools/nsc/interpreter/ILoop.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/repl/scala/tools/nsc/interpreter/ILoop.scala b/src/repl/scala/tools/nsc/interpreter/ILoop.scala index 50c89f7442..6197aea93d 100644 --- a/src/repl/scala/tools/nsc/interpreter/ILoop.scala +++ b/src/repl/scala/tools/nsc/interpreter/ILoop.scala @@ -428,7 +428,7 @@ class ILoop(in0: Option[BufferedReader], protected val out: JPrintWriter) // return false if repl should exit def processLine(line: String): Boolean = { import scala.concurrent.duration._ - Await.ready(globalFuture, 60.seconds) + Await.ready(globalFuture, 10.minutes) // Long timeout here to avoid test failures under heavy load. if (line eq null) { // SI-4563: this means the console was properly interrupted (Ctrl+D usually) |