diff options
author | Philipp Haller <hallerp@gmail.com> | 2008-07-09 16:51:32 +0000 |
---|---|---|
committer | Philipp Haller <hallerp@gmail.com> | 2008-07-09 16:51:32 +0000 |
commit | e85297fc2b1783770ec8eeda8bc0254d7379f7ad (patch) | |
tree | fa1f47b7908bd49bd1370570dc036fb2f8768422 /src | |
parent | f3bfae5a987ad9e8d61b214fb4c8d0f2f159d080 (diff) | |
download | scala-e85297fc2b1783770ec8eeda8bc0254d7379f7ad.tar.gz scala-e85297fc2b1783770ec8eeda8bc0254d7379f7ad.tar.bz2 scala-e85297fc2b1783770ec8eeda8bc0254d7379f7ad.zip |
Increased timeout in build.xml to make all test...
Increased timeout in build.xml to make all tests pass.
Diffstat (limited to 'src')
-rw-r--r-- | src/partest/scala/tools/partest/nest/CompileManager.scala | 6 | ||||
-rw-r--r-- | src/partest/scala/tools/partest/nest/FileManager.scala | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/partest/scala/tools/partest/nest/CompileManager.scala b/src/partest/scala/tools/partest/nest/CompileManager.scala index 995bad0f80..b580ed0d2f 100644 --- a/src/partest/scala/tools/partest/nest/CompileManager.scala +++ b/src/partest/scala/tools/partest/nest/CompileManager.scala @@ -170,6 +170,8 @@ class CompileManager(val fileManager: FileManager) { compiler = new /*ReflectiveCompiler*/ DirectCompiler(fileManager) } + val delay = fileManager.timeout.toLong + def withTimeout(file: File)(thunk: => Boolean): Boolean = { createSeparateCompiler() @@ -179,9 +181,9 @@ class CompileManager(val fileManager: FileManager) { parent ! (self, thunk) } - receiveWithin(fileManager.timeout.toLong) { + receiveWithin(delay) { case TIMEOUT => - NestUI.verbose("action timed out") + println("compilation timed out") false case Exit(from, reason) if from == child => val From = from diff --git a/src/partest/scala/tools/partest/nest/FileManager.scala b/src/partest/scala/tools/partest/nest/FileManager.scala index 4b9082d8f2..36e051e221 100644 --- a/src/partest/scala/tools/partest/nest/FileManager.scala +++ b/src/partest/scala/tools/partest/nest/FileManager.scala @@ -55,5 +55,5 @@ trait FileManager { var SCALAC_OPTS = System.getProperty("scalatest.scalac_opts", "-deprecation") - var timeout = "600000" + var timeout = "1200000" } |