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/OptionBundle.scala | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/test/scala/chiselTests/OptionBundle.scala') diff --git a/src/test/scala/chiselTests/OptionBundle.scala b/src/test/scala/chiselTests/OptionBundle.scala index b9b50baa..33529633 100644 --- a/src/test/scala/chiselTests/OptionBundle.scala +++ b/src/test/scala/chiselTests/OptionBundle.scala @@ -3,6 +3,7 @@ package chiselTests import chisel3._ +import chisel3.stage.ChiselStage import chisel3.testers.BasicTester class OptionBundle(val hasIn: Boolean) extends Bundle { @@ -43,7 +44,7 @@ class InvalidOptionBundleTester() extends BasicTester { stop() } -class OptionBundleSpec extends ChiselFlatSpec { +class OptionBundleSpec extends ChiselFlatSpec with Utils { "A Bundle with an Option field" should "work properly if the Option field is not None" in { assertTesterPasses { new SomeOptionBundleTester(true) } assertTesterPasses { new SomeOptionBundleTester(false) } @@ -54,8 +55,8 @@ class OptionBundleSpec extends ChiselFlatSpec { } "A Bundle with an Option field" should "assert out accessing a None Option field" in { - a [Exception] should be thrownBy { - elaborate { new InvalidOptionBundleTester() } + a [Exception] should be thrownBy extractCause[Exception] { + ChiselStage.elaborate { new InvalidOptionBundleTester() } } } } -- cgit v1.2.3