From 16714d6abeab5140e97d8370e8b901b4eb816fde Mon Sep 17 00:00:00 2001 From: Jiuyang Liu Date: Wed, 24 Nov 2021 02:56:03 +0800 Subject: fix tests that depend on Driver (#2429) Co-authored-by: sinofp --- .../scala/firrtlTests/transforms/TopWiringTest.scala | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'src/test/scala/firrtlTests/transforms') diff --git a/src/test/scala/firrtlTests/transforms/TopWiringTest.scala b/src/test/scala/firrtlTests/transforms/TopWiringTest.scala index 1cee9f74..050c57c8 100644 --- a/src/test/scala/firrtlTests/transforms/TopWiringTest.scala +++ b/src/test/scala/firrtlTests/transforms/TopWiringTest.scala @@ -9,6 +9,7 @@ import firrtl._ import firrtl.ir.{GroundType, IntWidth, Type} import firrtl.Parser import firrtl.annotations.{CircuitName, ComponentName, ModuleName, Target} +import firrtl.stage.FirrtlStage import firrtl.transforms.TopWiring._ import firrtl.testutils._ @@ -604,18 +605,20 @@ class TopWiringTests extends MiddleTransformSpec with TopWiringTestsCommon { "firrtl.transforms.TopWiring.TopWiringTransform", "--input-file", inputFile, - "--top-name", - "Top", "--compiler", "low", "--info-mode", "ignore" ) - firrtl.Driver.execute(args) match { - case FirrtlExecutionSuccess(_, emitted) => - parse(emitted).serialize should be(parse(input).serialize) - case _ => fail - } + val emitted = + try { + (new FirrtlStage) + .execute(args, Seq()) + .collectFirst { case EmittedFirrtlCircuitAnnotation(value) => value } + .get + .value + } catch { case _: Throwable => fail } + parse(emitted).serialize should be(parse(input).serialize) } "TopWiringTransform" should "remove TopWiringAnnotations" in { -- cgit v1.2.3