From 5b3e09a614787bd80dc29d51a69ae7476fbb6bf2 Mon Sep 17 00:00:00 2001 From: Albert Magyar Date: Fri, 28 Aug 2020 16:32:12 -0700 Subject: Add custom transforms 'upstream' of emitter annotation in equiv tests --- src/test/scala/firrtl/testutils/FirrtlSpec.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/test/scala/firrtl/testutils/FirrtlSpec.scala b/src/test/scala/firrtl/testutils/FirrtlSpec.scala index 9ee5fdaf..244366f4 100644 --- a/src/test/scala/firrtl/testutils/FirrtlSpec.scala +++ b/src/test/scala/firrtl/testutils/FirrtlSpec.scala @@ -107,13 +107,13 @@ trait FirrtlRunners extends BackendCompilationUtilities { } val customName = s"${prefix}_custom" - val customAnnos = getBaseAnnos(customName) ++: toAnnos((new GetNamespace) +: customTransforms) ++: customAnnotations + val customAnnos = customAnnotations ++: toAnnos((new GetNamespace) +: customTransforms) ++: getBaseAnnos(customName) val customResult = (new firrtl.stage.FirrtlStage).execute(Array.empty, customAnnos) val nsAnno = customResult.collectFirst { case m: ModuleNamespaceAnnotation => m }.get val refSuggestedName = s"${prefix}_ref" - val refAnnos = getBaseAnnos(refSuggestedName) ++: Seq(RunFirrtlTransformAnnotation(new RenameModules), nsAnno) + val refAnnos = Seq(RunFirrtlTransformAnnotation(new RenameModules), nsAnno) ++: getBaseAnnos(refSuggestedName) val refResult = (new firrtl.stage.FirrtlStage).execute(Array.empty, refAnnos) val refName = -- cgit v1.2.3