diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2014-09-30 10:58:42 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2014-09-30 10:58:42 +1000 |
| commit | a026fd5e08d32d25e44add76384f823d35183c4f (patch) | |
| tree | a9deedeb96ec09780de1870e1cfd7ed13e5e6e8c /src/interactive/scala/tools/nsc/interactive | |
| parent | 344151f17b04bf75d6ebafec6aa4229dfe6cbf09 (diff) | |
| parent | 2cfac1a3516850a40728fefd8f808613d2e83f84 (diff) | |
| download | scala-a026fd5e08d32d25e44add76384f823d35183c4f.tar.gz scala-a026fd5e08d32d25e44add76384f823d35183c4f.tar.bz2 scala-a026fd5e08d32d25e44add76384f823d35183c4f.zip | |
Merge remote-tracking branch 'origin/2.11.x' into merge/2.11.x-to-2.12.x-20140930
Diffstat (limited to 'src/interactive/scala/tools/nsc/interactive')
| -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(".")) |