diff options
-rw-r--r-- | build.xml | 2 | ||||
-rw-r--r-- | src/partest/scala/tools/partest/nest/CompileManager.scala | 6 | ||||
-rw-r--r-- | src/partest/scala/tools/partest/nest/FileManager.scala | 2 |
3 files changed, 6 insertions, 4 deletions
@@ -921,7 +921,7 @@ BOOTRAPING TEST AND TEST SUITE <target name="test.suite" depends="pack.done"> <partest showlog="yes" erroronfailed="yes" javacmd="${java.home}/bin/java" - timeout="600000"> + timeout="1200000"> <classpath> <path refid="pack.classpath"/> <fileset dir="${test.dir}/files/lib" includes="*.jar"/> 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" } |