summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2010-12-30 09:27:56 +0000
committerPaul Phillips <paulp@improving.org>2010-12-30 09:27:56 +0000
commit89de9c3f9ff33d9fe74263f49ff8cdb987211fbf (patch)
tree07f7c0ec490b5afc34e88f00e0822c87744d4ba0 /src
parente33bb82c2d07f428bc1a0f4307a6d6c187c3cbe3 (diff)
downloadscala-89de9c3f9ff33d9fe74263f49ff8cdb987211fbf.tar.gz
scala-89de9c3f9ff33d9fe74263f49ff8cdb987211fbf.tar.bz2
scala-89de9c3f9ff33d9fe74263f49ff8cdb987211fbf.zip
Thinking I have to dial down a timeout.
Diffstat (limited to 'src')
-rw-r--r--src/partest/scala/tools/partest/nest/FileManager.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/partest/scala/tools/partest/nest/FileManager.scala b/src/partest/scala/tools/partest/nest/FileManager.scala
index 13afc5b34b..589332430a 100644
--- a/src/partest/scala/tools/partest/nest/FileManager.scala
+++ b/src/partest/scala/tools/partest/nest/FileManager.scala
@@ -50,7 +50,7 @@ trait FileManager {
var SCALAC_OPTS = PartestDefaults.scalacOpts
var JAVA_OPTS = PartestDefaults.javaOpts
var timeout = PartestDefaults.timeout
- var oneTestTimeout = 5 * 60 * 1000 // if one test takes over 5 minutes it must go
+ var oneTestTimeout = 15 * 60 * 1000 // okay, let's try 15
/** Only when --debug is given. */
lazy val testTimings = new HashMap[String, Long]