Use local built simulator, also in GitHub action

leros-dev · May 12, 2024 · 434bf88 · 434bf88
1 parent 5906967
commit 434bf88
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml
@@ -21,5 +21,7 @@ jobs:
       with:
         java-version: '11'
         distribution: 'temurin'
+    - name: build simulator
+      run: make init
     - name: Run tests
       run: sbt test
diff --git a/Makefile b/Makefile
@@ -4,6 +4,11 @@
 # including cosimulation and check against Morten's simulator
 # TODO: cleanup
 
+# init submodules and build leros-sim
+init:
+	git submodule update --init --recursive
+	cd leros-sim && ./build.sh
+
 # runs all tests
 test:
 	sbt test

diff --git a/src/test/scala/leros/CompareTest.scala b/src/test/scala/leros/CompareTest.scala
@@ -17,7 +17,7 @@ import scala.collection.mutable.ListBuffer
 
 class CompareTest extends AnyFlatSpec with ChiselScalatestTester {
 
-  val simulator = "../leros-sim/build-leros-sim/leros-sim"
+  val simulator = "leros-sim/build-leros-sim/leros-sim"
   if ((new java.io.File(simulator)).isFile) {
 
     val progs = leros.shared.Util.getProgs()