diff options
author | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2014-09-29 15:34:45 +0200 |
---|---|---|
committer | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2014-09-29 15:34:45 +0200 |
commit | cb26ad3ddb426484dccca988be9c16673d4b7fa4 (patch) | |
tree | fa3b2e6d5c8736966e4445e213043de48ad28fa7 | |
parent | 5508e00a552d81ce483bd69084eea087fb178647 (diff) | |
parent | 532042430e7ba03642af042cc6f188a589f1decf (diff) | |
download | scala-cb26ad3ddb426484dccca988be9c16673d4b7fa4.tar.gz scala-cb26ad3ddb426484dccca988be9c16673d4b7fa4.tar.bz2 scala-cb26ad3ddb426484dccca988be9c16673d4b7fa4.zip |
Merge pull request #4007 from retronym/topic/bump-timeout
Bump timeout in interactive tests from 10s -> 30s.
-rw-r--r-- | src/interactive/scala/tools/nsc/interactive/tests/core/TestSettings.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/interactive/scala/tools/nsc/interactive/tests/core/TestSettings.scala b/src/interactive/scala/tools/nsc/interactive/tests/core/TestSettings.scala index 681204172b..4962d80a8b 100644 --- a/src/interactive/scala/tools/nsc/interactive/tests/core/TestSettings.scala +++ b/src/interactive/scala/tools/nsc/interactive/tests/core/TestSettings.scala @@ -4,7 +4,7 @@ import scala.tools.nsc.io.Path /** Common settings for the test. */ private[tests] trait TestSettings { - protected final val TIMEOUT = 10000 // timeout in milliseconds + protected final val TIMEOUT = 30000 // timeout in milliseconds /** The root directory for this test suite, usually the test kind ("test/files/presentation"). */ protected val outDir = Path(Option(System.getProperty("partest.cwd")).getOrElse(".")) |