From f13bcfab0c114e534264a2309228bc68721d2d16 Mon Sep 17 00:00:00 2001
From: Gregor Haas <ghaas97@cs.washington.edu>
Date: Tue, 18 Jun 2024 13:43:16 -0700
Subject: [PATCH] more bugfixes

---
 .github/workflows/test-system.yml    |  3 ++-
 mkutils/plat/cva6/run.mk             | 10 ++++++++--
 mkutils/plat/mpfs/run.mk             |  2 +-
 scripts/ci/plat/cva6/expected.log    |  1 -
 scripts/ci/plat/generic/expected.log |  1 -
 scripts/ci/plat/mpfs/expected.log    |  1 -
 6 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/test-system.yml b/.github/workflows/test-system.yml
index 213a82053..0ccc63e3d 100644
--- a/.github/workflows/test-system.yml
+++ b/.github/workflows/test-system.yml
@@ -7,6 +7,7 @@ jobs:
     runs-on: ${{ matrix.platform == 'generic' && 'ubuntu-latest' || matrix.platform }}
     environment: ${{ matrix.platform != 'generic' && 'track' || null }}
     strategy:
+      fail-fast: false
       matrix:
         platform: [generic, mpfs, cva6]
         bits: [32, 64]
@@ -82,7 +83,7 @@ jobs:
 
     - name: Check expected
       run: |
-        [[ -z $(diff cmd.log scripts/ci/plat/${{ matrix.platform }}/expected.log) ]]
+        [[ -z $(diff -w cmd.log scripts/ci/plat/${{ matrix.platform }}/expected.log) ]]
 
     - name: Upload run log
       if: failure()
diff --git a/mkutils/plat/cva6/run.mk b/mkutils/plat/cva6/run.mk
index 6e79789c3..cae910f80 100644
--- a/mkutils/plat/cva6/run.mk
+++ b/mkutils/plat/cva6/run.mk
@@ -9,8 +9,6 @@ KERNEL			= $(BUILDROOT_BUILDDIR)/images/uImage
 SDDEVICE_PART1          = $(shell lsblk $(SD_DEVICE) -no PATH | head -2 | tail -1)
 SDDEVICE_PART2          = $(shell lsblk $(SD_DEVICE) -no PATH | head -3 | tail -1)
 
-
-
 flash: $(SD_DEVICE)
 	$(info PAYLOAD INFORMATION)
 	$(info $(PAYLOAD))
@@ -21,6 +19,14 @@ flash: $(SD_DEVICE)
 	dd if=$(PAYLOAD) of=$(SDDEVICE_PART1) status=progress oflag=sync bs=1M
 	dd if=$(KERNEL) of=$(SDDEVICE_PART2) status=progress oflag=sync bs=1M
 
+CALL_LOGFILE ?= $(shell mktemp)
+call:
+	$(call log,info,Calling command on the CVA6 board)
+	ssh -i $(BUILDROOT_BUILDDIR)/target/root/.ssh/id-rsa \
+                -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \
+                 root@$(KEYSTONE_IP) $(KEYSTONE_COMMAND) 2>&1 | \
+                 grep -v "Warning: Permanently added" | tee -a $(CALL_LOGFILE)
+
 debug-connect:
 	$(call log,info,Connecting to OpenOCD)
 	$(BUILDROOT_BUILDDIR)/host/bin/riscv64-buildroot-linux-gnu-gdb \
diff --git a/mkutils/plat/mpfs/run.mk b/mkutils/plat/mpfs/run.mk
index 8b81a0ad7..e2162950d 100644
--- a/mkutils/plat/mpfs/run.mk
+++ b/mkutils/plat/mpfs/run.mk
@@ -20,7 +20,7 @@ run:
 
 CALL_LOGFILE ?= $(shell mktemp)
 call:
-	$(call log,info,Calling command in QEMU)
+	$(call log,info,Calling command on the MPFS board)
 	ssh -i $(BUILDROOT_BUILDDIR)/target/root/.ssh/id-rsa \
 		-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \
 		 root@$(KEYSTONE_IP) $(KEYSTONE_COMMAND) 2>&1 | \
diff --git a/scripts/ci/plat/cva6/expected.log b/scripts/ci/plat/cva6/expected.log
index a9ef4c0d4..6cb4b2318 100644
--- a/scripts/ci/plat/cva6/expected.log
+++ b/scripts/ci/plat/cva6/expected.log
@@ -1,4 +1,3 @@
-
 Verifying archive integrity... MD5 checksums are OK. All good.
 Uncompressing Keystone Enclave Package
 testing test-stack
diff --git a/scripts/ci/plat/generic/expected.log b/scripts/ci/plat/generic/expected.log
index a4bcaf3b6..35e3053d8 100644
--- a/scripts/ci/plat/generic/expected.log
+++ b/scripts/ci/plat/generic/expected.log
@@ -1,4 +1,3 @@
-
 Verifying archive integrity... MD5 checksums are OK. All good.
 Uncompressing Keystone Enclave Package
 testing test-stack
diff --git a/scripts/ci/plat/mpfs/expected.log b/scripts/ci/plat/mpfs/expected.log
index a9ef4c0d4..6cb4b2318 100644
--- a/scripts/ci/plat/mpfs/expected.log
+++ b/scripts/ci/plat/mpfs/expected.log
@@ -1,4 +1,3 @@
-
 Verifying archive integrity... MD5 checksums are OK. All good.
 Uncompressing Keystone Enclave Package
 testing test-stack