summaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorPalmer Dabbelt2015-12-06 22:20:29 -0800
committerPalmer Dabbelt2015-12-06 22:20:29 -0800
commit035a30d25cdd955af6385c1334826781b17d894c (patch)
tree9dbf9b3ba419bc7f4133812c757a9ce51ee8e58f /src/test
parentc26ca883aab6499216c673f867ee61651a9c11a2 (diff)
parentd20591e0d030d5c380e279999659fbfa9f41d3d3 (diff)
Merge pull request #60 from ucb-bar/packsplit
Split internal and FIRRTL packages
Diffstat (limited to 'src/test')
-rw-r--r--src/test/scala/chiselTests/ChiselSpec.scala2
-rw-r--r--src/test/scala/chiselTests/Reg.scala2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/test/scala/chiselTests/ChiselSpec.scala b/src/test/scala/chiselTests/ChiselSpec.scala
index 8848d4f5..000880e2 100644
--- a/src/test/scala/chiselTests/ChiselSpec.scala
+++ b/src/test/scala/chiselTests/ChiselSpec.scala
@@ -11,7 +11,7 @@ import Chisel.testers._
/** Common utility functions for Chisel unit tests. */
trait ChiselRunners {
def execute(t: => BasicTester): Boolean = TesterDriver.execute(() => t)
- def elaborate(t: => Module): Circuit = Driver.elaborate(() => t)
+ def elaborate(t: => Module): Unit = Driver.elaborate(() => t)
}
/** Spec base class for BDD-style testers. */
diff --git a/src/test/scala/chiselTests/Reg.scala b/src/test/scala/chiselTests/Reg.scala
index 55c92b45..f2620d88 100644
--- a/src/test/scala/chiselTests/Reg.scala
+++ b/src/test/scala/chiselTests/Reg.scala
@@ -8,7 +8,7 @@ import Chisel.testers.BasicTester
class RegSpec extends ChiselFlatSpec {
"A Reg" should "throw an exception if not given any parameters" in {
- a [ChiselException] should be thrownBy {
+ a [Exception] should be thrownBy {
val reg = Reg()
}
}