natas_hw
/
legacy-svn-scala
mirror of https://github.com/scala/legacy-svn-scala
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Increased timeout in build.xml to make all tests pass. 

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@15517 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
This commit is contained in:
phaller 2008-07-09 16:51:32 +00:00
parent 11b5b05893
commit 7e78154bb4
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.xml
View File

@ -921,7 +921,7 @@ BOOTRAPING TEST AND TEST SUITE
<target name="test.suite" depends="pack.done"> <target name="test.suite" depends="pack.done">
<partest showlog="yes" erroronfailed="yes" javacmd="${java.home}/bin/java" <partest showlog="yes" erroronfailed="yes" javacmd="${java.home}/bin/java"
timeout="600000"> timeout="1200000">
<classpath> <classpath>
<path refid="pack.classpath"/> <path refid="pack.classpath"/>
<fileset dir="${test.dir}/files/lib" includes="*.jar"/> <fileset dir="${test.dir}/files/lib" includes="*.jar"/>

6
src/partest/scala/tools/partest/nest/CompileManager.scala
View File

@ -170,6 +170,8 @@ class CompileManager(val fileManager: FileManager) {
compiler = new /*ReflectiveCompiler*/ DirectCompiler(fileManager) compiler = new /*ReflectiveCompiler*/ DirectCompiler(fileManager)
} }
val delay = fileManager.timeout.toLong
def withTimeout(file: File)(thunk: => Boolean): Boolean = { def withTimeout(file: File)(thunk: => Boolean): Boolean = {
createSeparateCompiler() createSeparateCompiler()
@ -179,9 +181,9 @@ class CompileManager(val fileManager: FileManager) {
parent ! (self, thunk) parent ! (self, thunk)
} }
receiveWithin(fileManager.timeout.toLong) { receiveWithin(delay) {
case TIMEOUT => case TIMEOUT =>
NestUI.verbose("action timed out") println("compilation timed out")
false false
case Exit(from, reason) if from == child => case Exit(from, reason) if from == child =>
val From = from val From = from

2
src/partest/scala/tools/partest/nest/FileManager.scala
View File

@ -55,5 +55,5 @@ trait FileManager {
var SCALAC_OPTS = System.getProperty("scalatest.scalac_opts", "-deprecation") var SCALAC_OPTS = System.getProperty("scalatest.scalac_opts", "-deprecation")
var timeout = "600000" var timeout = "1200000"
} }