From 845e6f7458d1e5f04bb0c6117007eeb47097fb9a Mon Sep 17 00:00:00 2001 From: Andrew Waterman Date: Sat, 22 Apr 2017 22:12:26 -0700 Subject: [PATCH] Filter out duplicate test suites I botched the refactoring in 5934c7b4b91c0e19d4f8f7ae8baa6ec034d59391 --- src/main/scala/rocketchip/RocketTestSuite.scala | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/scala/rocketchip/RocketTestSuite.scala b/src/main/scala/rocketchip/RocketTestSuite.scala index 1cdcf317..32e7b664 100644 --- a/src/main/scala/rocketchip/RocketTestSuite.scala +++ b/src/main/scala/rocketchip/RocketTestSuite.scala @@ -4,7 +4,7 @@ package rocketchip import Chisel._ -import scala.collection.mutable.{LinkedHashSet, ArrayBuffer} +import scala.collection.mutable.LinkedHashSet abstract class RocketTestSuite { val dir: String @@ -56,9 +56,9 @@ class RegressionTestSuite(val names: LinkedHashSet[String]) extends RocketTestSu } object TestGeneration { - private val suites = ArrayBuffer[RocketTestSuite]() + private val suites = collection.mutable.ListMap[String, RocketTestSuite]() - def addSuite(s: RocketTestSuite) { suites += s } + def addSuite(s: RocketTestSuite) { suites += (s.makeTargetName -> s) } def addSuites(s: Seq[RocketTestSuite]) { s.foreach(addSuite) } @@ -93,7 +93,7 @@ run-$kind-tests-fast: $$(addprefix $$(output_dir)/, $$(addsuffix .run, $targets) } else { "\n" } } - suites.groupBy(_.kind).map { case (kind, s) => gen(kind, s) }.mkString("\n") + suites.values.toSeq.groupBy(_.kind).map { case (kind, s) => gen(kind, s) }.mkString("\n") } }