From d67c4100bd9e24cb9337ad932ba342fd5c49dee4 Mon Sep 17 00:00:00 2001 From: Schuyler Eldridge Date: Tue, 10 Mar 2020 21:18:36 -0400 Subject: Wrap elaboration in ChiselException Signed-off-by: Schuyler Eldridge squash! Wrap elaboration in ChiselException --- src/test/scala/chiselTests/ChiselSpec.scala | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/test/scala/chiselTests/ChiselSpec.scala') diff --git a/src/test/scala/chiselTests/ChiselSpec.scala b/src/test/scala/chiselTests/ChiselSpec.scala index 9af7e88f..be1b2d60 100644 --- a/src/test/scala/chiselTests/ChiselSpec.scala +++ b/src/test/scala/chiselTests/ChiselSpec.scala @@ -7,7 +7,6 @@ import org.scalatest.prop._ import org.scalacheck._ import chisel3._ import chisel3.testers._ -import firrtl.options.OptionsException import firrtl.{AnnotationSeq, CommonOptions, ExecutionOptionsManager, FirrtlExecutionFailure, FirrtlExecutionSuccess, HasFirrtlOptions} import firrtl.util.BackendCompilationUtilities import java.io.ByteArrayOutputStream @@ -100,7 +99,7 @@ class ChiselTestUtilitiesSpec extends ChiselFlatSpec { import org.scalatest.exceptions.TestFailedException // Who tests the testers? "assertKnownWidth" should "error when the expected width is wrong" in { - val caught = intercept[OptionsException] { + val caught = intercept[ChiselException] { assertKnownWidth(7) { Wire(UInt(8.W)) } @@ -123,7 +122,7 @@ class ChiselTestUtilitiesSpec extends ChiselFlatSpec { } "assertInferredWidth" should "error if the width is known" in { - val caught = intercept[OptionsException] { + val caught = intercept[ChiselException] { assertInferredWidth(8) { Wire(UInt(8.W)) } -- cgit v1.2.3