From 6e03f63d525aac0bdf4a59b6fe66a0b4d5a3a25a Mon Sep 17 00:00:00 2001 From: Schuyler Eldridge Date: Tue, 16 Jun 2020 11:59:15 -0400 Subject: Use ChiselStage in Tests This migrates the tests to Chisel 3.4/FIRRTL 1.4. This primarily involves removing usages of deprecated methods including: - Remove usages of Driver - Use ChiselStage methods instead of BackendCompilationUtilities methods - Use Dependency API for custom transforms - Use extractCause to unpack StackError Signed-off-by: Schuyler Eldridge --- src/test/scala/chiselTests/When.scala | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/test/scala/chiselTests/When.scala') diff --git a/src/test/scala/chiselTests/When.scala b/src/test/scala/chiselTests/When.scala index df9c8cce..9f4f35b0 100644 --- a/src/test/scala/chiselTests/When.scala +++ b/src/test/scala/chiselTests/When.scala @@ -3,6 +3,7 @@ package chiselTests import chisel3._ +import chisel3.stage.ChiselStage import chisel3.testers.BasicTester import chisel3.util._ @@ -91,7 +92,7 @@ class SubmoduleWhenTester extends BasicTester { } } -class WhenSpec extends ChiselFlatSpec { +class WhenSpec extends ChiselFlatSpec with Utils { "When, elsewhen, and otherwise with orthogonal conditions" should "work" in { assertTesterPasses{ new WhenTester } } @@ -106,8 +107,8 @@ class WhenSpec extends ChiselFlatSpec { } "Returning in a when scope" should "give a reasonable error message" in { - val e = the [ChiselException] thrownBy { - elaborate(new Module { + val e = the [ChiselException] thrownBy extractCause[ChiselException] { + ChiselStage.elaborate(new Module { val io = IO(new Bundle { val foo = Input(UInt(8.W)) val bar = Input(UInt(8.W)) -- cgit v1.2.3