summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2010-11-17 20:21:15 +0000
committerPaul Phillips <paulp@improving.org>2010-11-17 20:21:15 +0000
commit48451f980e1a252a0470e72dfd944b1eee52891b (patch)
tree489383af644127d4751a282e80accd64479dc586 /src
parent1fbd342a80a1cafbdb3c124cb90862d3713ae3e8 (diff)
downloadscala-48451f980e1a252a0470e72dfd944b1eee52891b.tar.gz
scala-48451f980e1a252a0470e72dfd944b1eee52891b.tar.bz2
scala-48451f980e1a252a0470e72dfd944b1eee52891b.zip
Fixed the bug which was hanging partest.
(apparently) the bug which has had me chasing concurrency ghosts throughout the haunted castle. No review.
Diffstat (limited to 'src')
-rw-r--r--src/partest/scala/tools/partest/nest/DirectRunner.scala4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/partest/scala/tools/partest/nest/DirectRunner.scala b/src/partest/scala/tools/partest/nest/DirectRunner.scala
index 7410e890a0..cca7804b9b 100644
--- a/src/partest/scala/tools/partest/nest/DirectRunner.scala
+++ b/src/partest/scala/tools/partest/nest/DirectRunner.scala
@@ -36,7 +36,9 @@ trait DirectRunner {
}
}
- def runTestsForFiles(kindFiles: List[File], kind: String): scala.collection.immutable.Map[String, Int] = {
+ def runTestsForFiles(_kindFiles: List[File], kind: String): scala.collection.immutable.Map[String, Int] = {
+ /** NO DUPLICATES, or partest will blow the count and hang forever. **/
+ val kindFiles = _kindFiles.distinct
val len = kindFiles.length
val (testsEach, lastFrag) = (len/numActors, len%numActors)
val last = numActors-1