wu-arch/chipyard
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Move to scalatest 3.2

Browse Source 
Requires updating to AnyFlatSpec where used
And different import for Matchers
This commit is contained in:
chick
2021-02-03 21:03:22 -08:00
parent caa1467d87
commit d9d9d0fbb5
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tapeout/src/test/scala/barstools/tapeout/transforms/ResetInverterSpec.scala
View File

@@ -5,7 +5,8 @@ package barstools.tapeout.transforms
import chisel3._
import chisel3.stage.{ChiselGeneratorAnnotation, ChiselStage}
import firrtl.{EmittedFirrtlCircuitAnnotation, EmittedFirrtlModuleAnnotation}
import org.scalatest.{FreeSpec, Matchers}
import org.scalatest.freespec.AnyFreeSpec
import org.scalatest.matchers.should.Matchers
class ExampleModuleNeedsResetInverted extends Module with ResetInverter {
val io = IO(new Bundle {
@@ -19,7 +20,7 @@ class ExampleModuleNeedsResetInverted extends Module with ResetInverter {
invert(this)
}
class ResetNSpec extends FreeSpec with Matchers {
class ResetNSpec extends AnyFreeSpec with Matchers {
"Inverting reset needs to be done throughout module in Chirrtl" in {
val chirrtl = (new ChiselStage).emitChirrtl(new ExampleModuleNeedsResetInverted)
chirrtl should include("input reset :")

5
tapeout/src/test/scala/barstools/tapeout/transforms/retime/RetimeSpec.scala
View File

@@ -6,9 +6,10 @@ import chisel3._
import chisel3.stage.{ChiselGeneratorAnnotation, ChiselStage}
import firrtl.{EmittedFirrtlCircuitAnnotation, EmittedFirrtlModuleAnnotation, FileUtils}
import logger.Logger
import org.scalatest.{FlatSpec, Matchers}
import org.scalatest.flatspec.AnyFlatSpec
import org.scalatest.matchers.should.Matchers
class RetimeSpec extends FlatSpec with Matchers {
class RetimeSpec extends AnyFlatSpec with Matchers {
def normalized(s: String): String = {
require(!s.contains("\n"))
s.replaceAll("\\s+", " ").trim