diff options
author | Philipp Haller <hallerp@gmail.com> | 2009-07-02 18:43:13 +0000 |
---|---|---|
committer | Philipp Haller <hallerp@gmail.com> | 2009-07-02 18:43:13 +0000 |
commit | ffb3ff17c1084bc0f9f47194369a1c61a9bd00d4 (patch) | |
tree | 4142a20a7c36e702c761a996420d898872388692 | |
parent | 3b72f6de8213b573675650d4ca16c0563981f965 (diff) | |
download | scala-ffb3ff17c1084bc0f9f47194369a1c61a9bd00d4.tar.gz scala-ffb3ff17c1084bc0f9f47194369a1c61a9bd00d4.tar.bz2 scala-ffb3ff17c1084bc0f9f47194369a1c61a9bd00d4.zip |
Removed obsolete Scheduler restart.
-rw-r--r-- | src/partest/scala/tools/partest/nest/DirectRunner.scala | 6 | ||||
-rw-r--r-- | src/partest/scala/tools/partest/nest/Worker.scala | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/partest/scala/tools/partest/nest/DirectRunner.scala b/src/partest/scala/tools/partest/nest/DirectRunner.scala index 898b795d93..7a610869a1 100644 --- a/src/partest/scala/tools/partest/nest/DirectRunner.scala +++ b/src/partest/scala/tools/partest/nest/DirectRunner.scala @@ -12,7 +12,7 @@ import java.io.{File, PrintStream, FileOutputStream, BufferedReader, import java.util.StringTokenizer import scala.actors.Actor._ -import scala.actors.{Scheduler, TIMEOUT} +import scala.actors.TIMEOUT trait DirectRunner { @@ -39,10 +39,6 @@ trait DirectRunner { val len = kindFiles.length val (testsEach, lastFrag) = (len/numActors, len%numActors) val last = numActors-1 - - // make sure Actor Scheduler is up and running - Scheduler.restart() - val workers = for (i <- List.range(0, numActors)) yield { val toTest = kindFiles.slice(i*testsEach, (i+1)*testsEach) val worker = new Worker(fileManager) diff --git a/src/partest/scala/tools/partest/nest/Worker.scala b/src/partest/scala/tools/partest/nest/Worker.scala index 0ecd9986f3..eedb3da160 100644 --- a/src/partest/scala/tools/partest/nest/Worker.scala +++ b/src/partest/scala/tools/partest/nest/Worker.scala @@ -759,7 +759,7 @@ class Worker(val fileManager: FileManager) extends Actor { val classFile = ClassFileParser.parse(byteCode) val Some(sig) = classFile.attribute("ScalaSig").map(_.byteCode).map(ScalaSigAttributeParsers.parse) import scala.tools.scalap.Main._ - parseScalaSignature(sig, packObj) + parseScalaSignature(sig/*, packObj*/) } runInContext(file, kind, (logFile: File, outDir: File) => { |