diff options
| author | Adam Izraelevitz | 2016-07-27 14:50:04 -0700 |
|---|---|---|
| committer | GitHub | 2016-07-27 14:50:04 -0700 |
| commit | dbf7cadd26d5fe3d525618696c101393251595b0 (patch) | |
| tree | bb4670ef2e1fd43d0369e7668abbbe7bb4d53344 /src/test/scala/firrtlTests/PassTests.scala | |
| parent | 07149ac70cd4e3b5d5cc33a19736d34fcb3e6478 (diff) | |
| parent | 8d23265e17eff17c12cfffbbe0fe754ceb0d4695 (diff) | |
Merge pull request #199 from ucb-bar/add-annotations
Rework Annotations
Diffstat (limited to 'src/test/scala/firrtlTests/PassTests.scala')
| -rw-r--r-- | src/test/scala/firrtlTests/PassTests.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/test/scala/firrtlTests/PassTests.scala b/src/test/scala/firrtlTests/PassTests.scala index efe7438c..e5269396 100644 --- a/src/test/scala/firrtlTests/PassTests.scala +++ b/src/test/scala/firrtlTests/PassTests.scala @@ -10,7 +10,6 @@ import firrtl.Parser.IgnoreInfo import firrtl.passes.{Pass, PassExceptions} import firrtl.{ Transform, - CircuitAnnotation, TransformResult, SimpleRun, Chisel3ToHighFirrtl, @@ -21,6 +20,7 @@ import firrtl.{ EmitFirrtl, Compiler } +import firrtl.Annotations.AnnotationMap // An example methodology for testing Firrtl Passes @@ -30,14 +30,14 @@ abstract class SimpleTransformSpec extends FlatSpec with Matchers with Compiler def parse(s: String): Circuit = Parser.parse(s.split("\n").toIterator, infoMode = IgnoreInfo) // Executes the test. Call in tests. - def execute(writer: Writer, annotations: Seq[CircuitAnnotation], input: String, check: String) = { + def execute(writer: Writer, annotations: AnnotationMap, input: String, check: String) = { compile(parse(input), annotations, writer) logger.debug(writer.toString) logger.debug(check) (parse(writer.toString)) should be (parse(check)) } // Executes the test, should throw an error - def failingexecute(writer: Writer, annotations: Seq[CircuitAnnotation], input: String) = { + def failingexecute(writer: Writer, annotations: AnnotationMap, input: String): Exception = { intercept[PassExceptions] { compile(parse(input), annotations, writer) } |
