summaryrefslogtreecommitdiff
path: root/src/interactive
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2014-09-29 17:10:23 +1000
committerJason Zaugg <jzaugg@gmail.com>2014-09-29 17:10:23 +1000
commit532042430e7ba03642af042cc6f188a589f1decf (patch)
treefa3b2e6d5c8736966e4445e213043de48ad28fa7 /src/interactive
parent5508e00a552d81ce483bd69084eea087fb178647 (diff)
downloadscala-532042430e7ba03642af042cc6f188a589f1decf.tar.gz
scala-532042430e7ba03642af042cc6f188a589f1decf.tar.bz2
scala-532042430e7ba03642af042cc6f188a589f1decf.zip
Bump timeout in interactive tests from 10s -> 30s.
Seeing too many of these failures on our build servers. https://scala-webapps.epfl.ch/jenkins/view/2.N.x/job/scala-nightly-auxjvm-2.11.x/148/jdk=jdk8,label=auxjvm/console This is most likely due to load on the machines.
Diffstat (limited to 'src/interactive')
-rw-r--r--src/interactive/scala/tools/nsc/interactive/tests/core/TestSettings.scala2
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("."))