From cbd702e48ec7553eb778884657927502a9f2d1f0 Mon Sep 17 00:00:00 2001
From: Howard Mao <zhehao.mao@gmail.com>
Date: Wed, 21 Sep 2016 18:45:12 -0700
Subject: [PATCH] make sure junctions and uncore unittests both run

---
 src/main/scala/unittest/Configs.scala | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/src/main/scala/unittest/Configs.scala b/src/main/scala/unittest/Configs.scala
index e11a4430..ed66a4bc 100644
--- a/src/main/scala/unittest/Configs.scala
+++ b/src/main/scala/unittest/Configs.scala
@@ -9,8 +9,10 @@ import cde.{Parameters, Config, CDEMatchError}
 import coreplex._
 import rocketchip._
 
-class WithJunctionsUnitTests extends Config(
+class WithUnitTests extends Config(
   (pname, site, here) => pname match {
+    case uncore.tilelink.TLId => "L1toL2"
+    case NCoreplexExtClients => 0
     case RegressionTestNames => LinkedHashSet("rv64ui-p-simple")
     case UnitTests => (p: Parameters) => {
       TestGeneration.addSuite(DefaultTestSuites.groundtest64("p")) // TODO why
@@ -18,20 +20,7 @@ class WithJunctionsUnitTests extends Config(
       Seq(
         Module(new junctions.MultiWidthFifoTest),
         Module(new junctions.NastiMemoryDemuxTest()(p)),
-        Module(new junctions.HastiTest()(p)))
-    }
-    case _ => throw new CDEMatchError
-  })
-
-class WithUncoreUnitTests extends Config(
-  (pname, site, here) => pname match {
-    case NCoreplexExtClients => 0
-    case uncore.tilelink.TLId => "L1toL2"
-    case RegressionTestNames => LinkedHashSet("rv64ui-p-simple")
-    case UnitTests => (p: Parameters) => {
-      TestGeneration.addSuite(DefaultTestSuites.groundtest64("p")) // TODO why
-      TestGeneration.addSuite(DefaultTestSuites.emptyBmarks)
-      Seq(
+        Module(new junctions.HastiTest()(p)),
         Module(new uncore.devices.ROMSlaveTest()(p)),
         Module(new uncore.devices.TileLinkRAMTest()(p)),
         Module(new uncore.tilelink2.TLFuzzRAMTest))
@@ -39,4 +28,4 @@ class WithUncoreUnitTests extends Config(
     case _ => throw new CDEMatchError
   })
 
-class UnitTestConfig extends Config(new WithUncoreUnitTests ++ new WithJunctionsUnitTests ++ new BaseConfig)
+class UnitTestConfig extends Config(new WithUnitTests ++ new BaseConfig)