Skip to content

Commit 76c9f13

Browse files
Add test compilation to compileAll buildUnits() (#4900)
Update/move tests failing with Scala 3
1 parent ffb940b commit 76c9f13

File tree

4 files changed

+10
-6
lines changed

4 files changed

+10
-6
lines changed

build.mill

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,16 @@ object v extends Module {
4040

4141
def buildUnits(): Seq[ScalaModule] = {
4242
scalaCrossVersions.flatMap { ver =>
43-
Seq(chisel(ver), stdlib.cross(ver), unipublish)
43+
Seq(
44+
chisel(ver),
45+
stdlib.cross(ver),
46+
chisel(ver).test,
47+
firrtl.cross(ver).test,
48+
svsim.cross(ver).test,
49+
unipublish
50+
)
4451
} ++ scalaCrossVersions.filterNot(isScala3(_)).flatMap { ver2 =>
4552
Seq(
46-
chisel(ver2).test,
47-
firrtl.cross(ver2).test,
48-
svsim.cross(ver2).test,
4953
`integration-tests`.cross(ver2).test,
5054
lit.utility.cross(ver2),
5155
panamaconverter.cross(ver2),

firrtl/src/test/scala/firrtlTests/options/ShellSpec.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ package firrtlTests.options
44

55
import firrtl.{annoSeqToSeq, seqToAnnoSeq, AnnotationSeq}
66
import firrtl.annotations.NoTargetAnnotation
7-
import firrtl.options.Shell
7+
import firrtl.options.{BareShell, Shell}
88
import org.scalatest.flatspec.AnyFlatSpec
99
import org.scalatest.matchers.should.Matchers
1010

@@ -16,7 +16,7 @@ class ShellSpec extends AnyFlatSpec with Matchers {
1616
case object D extends NoTargetAnnotation
1717
case object E extends NoTargetAnnotation
1818

19-
trait AlphabeticalCli { this: Shell =>
19+
trait AlphabeticalCli extends BareShell { this: Shell =>
2020
parser.opt[Unit]('c', "c-option").unbounded().action((x, c) => C +: c)
2121
parser.opt[Unit]('d', "d-option").unbounded().action((x, c) => D +: c)
2222
parser.opt[Unit]('e', "e-option").unbounded().action((x, c) => E +: c)

0 commit comments

Comments
 (0)