diff options
| -rw-r--r-- | .github/workflows/test.yml | 6 | ||||
| -rw-r--r-- | src/test/scala/firrtlTests/ExpandWhensSpec.scala | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 31f7ca6a..134670b8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -32,12 +32,12 @@ jobs: - name: Cache Scala uses: coursier/cache-action@v5 - name: Check Formatting (Scala 2.12 only) - if: matrix.scala == '2.12.12' + if: startsWith(matrix.scala, '2.12') run: sbt ++${{ matrix.scala }} scalafmtCheckAll - name: Unidoc run: sbt ++${{ matrix.scala }} unidoc - - name: Sanity check benchmarking scripts (Scala 2.12 only) - if: matrix.scala == '2.12.12' + - name: Sanity check benchmarking scripts (Scala 2.13 only) + if: startsWith(matrix.scala, '2.13') run: | benchmark/scripts/benchmark_cold_compile.py -N 2 --designs regress/ICache.fir --versions HEAD benchmark/scripts/find_heap_bound.py -- -cp firrtl*jar firrtl.stage.FirrtlMain -i regress/ICache.fir -o out -X verilog diff --git a/src/test/scala/firrtlTests/ExpandWhensSpec.scala b/src/test/scala/firrtlTests/ExpandWhensSpec.scala index 3c685734..52c87ffb 100644 --- a/src/test/scala/firrtlTests/ExpandWhensSpec.scala +++ b/src/test/scala/firrtlTests/ExpandWhensSpec.scala @@ -145,7 +145,8 @@ class ExpandWhensSpec extends FirrtlFlatSpec { | assert(clock, eq(in, UInt<1>("h1")), UInt<1>("h1"), "assert0") : test_assert | else : | skip""".stripMargin - val check = "assert(clock, eq(in, UInt<1>(\"h1\")), and(and(UInt<1>(\"h1\"), p), UInt<1>(\"h1\")), \"assert0\") : test_assert" + val check = + "assert(clock, eq(in, UInt<1>(\"h1\")), and(and(UInt<1>(\"h1\"), p), UInt<1>(\"h1\")), \"assert0\") : test_assert" executeTest(input, check, true) } it should "handle stops" in { |