Skip to content

Commit c5b076d

Browse files
author
Oron Port
committed
reenable nvc and verilator tests after upstream fixes
1 parent a0d62c0 commit c5b076d

File tree

3 files changed

+6
-14
lines changed

3 files changed

+6
-14
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ jobs:
3737
apps: sbt bloop
3838
- name: Setup All Simulation Tools but NVC
3939
uses: YosysHQ/setup-oss-cad-suite@v3
40-
- name: Setup Homebrew (for NVC)
41-
uses: Homebrew/actions/setup-homebrew@master
4240
- name: Setup NVC
43-
run: brew install nvc
41+
uses: nickg/setup-nvc@v1
42+
with:
43+
version: latest
4444
- run: |
4545
verilator -version
4646
iverilog -V

lib/src/test/scala/util/FullCompileSpec.scala

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,9 @@ abstract class FullCompileSpec extends FunSuite:
5050
given options.CompilerOptions.Backend = backends.verilog.v2001
5151
dut.compile.lintVerilog
5252

53-
// TODO: restore verilator when https://github.com/verilator/verilator/issues/6492
54-
// is fixed
5553
test("verilog.v95 compilation with no error"):
5654
given options.CompilerOptions.Backend = backends.verilog.v95
57-
val cd = dut.compile
58-
List(iverilog, vlog, xvlog).foreach { linter =>
59-
if (linter.isAvailable)
60-
given LinterOptions.VerilogLinter = linter
61-
cd.lint
62-
}
55+
dut.compile.lintVerilog
6356

6457
test("vhdl[default = v2008] compilation with no error"):
6558
given options.CompilerOptions.Backend = backends.vhdl

project/DFHDLCommands.scala

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,13 +115,12 @@ object DFHDLCommands {
115115
state
116116
}
117117

118-
// TODO: restore nvc when https://github.com/nickg/nvc/issues/1306 is fixed
119-
val vhdlTools = List("ghdl", "questa", "vivado")
118+
val vhdlTools = List("ghdl", "nvc", "questa", "vivado")
120119
val verilogTools = List("verilator", "iverilog", "questa", "vivado")
121120
val vhdlDialects = List("vhdl.v93", "vhdl.v2008")
122121
val verilogDialects = List("verilog.v95", "verilog.v2001", "verilog.sv2005")
123122
// Skip tests that are known to fail because of the tool
124-
val skip = Set(("verilator", "verilog.v95"), ("iverilog", "verilog.sv2005"), ("vivado", "vhdl.v2008"))
123+
val skip = Set(("iverilog", "verilog.sv2005"), ("vivado", "vhdl.v2008"))
125124

126125
val testApps = Command.command("testApps") { state =>
127126
var newState = Command.process("clearSandbox", state, _ => ())

0 commit comments

Comments
 (0)