From e65cb07b75c8ed670116e8e7a2f9d80061786ad5 Mon Sep 17 00:00:00 2001
From: Peter McGoron <code@mcgoron.com>
Date: Sun, 23 Oct 2022 14:03:29 -0400
Subject: [PATCH] add error return for tests

---
 tests/mk.sh          | 15 ++++++++-------
 tests/write_read.cpp | 10 +++++-----
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/tests/mk.sh b/tests/mk.sh
index 99a2949..417bd3a 100755
--- a/tests/mk.sh
+++ b/tests/mk.sh
@@ -21,7 +21,8 @@ run_test() {
 		-DVCDFILE="\"$DIR.fst\"" \
 		--Mdir $DIR \
 		$EXTARG \
-		simtop.v write_read.cpp $MODS
+		simtop.v write_read.cpp $MODS \
+	|| exit 1
 
 	cd "$DIR"
 	make -f Vsimtop.mk
@@ -35,7 +36,7 @@ for POL in 0 1; do
 			spi_master spi_slave \
 			simtop_$POL$PHASE 24 \
 			"../spi_master.v ../spi_slave.v"
-		)
+		) || exit 1
 
 		( \
 			run_test $POL $PHASE \
@@ -43,7 +44,7 @@ for POL in 0 1; do
 			simtop_ss$POL$PHASE 24 \
 			"../spi_master_ss.v ../spi_slave.v" \
 			"-DSPI_MASTER_SS -CFLAGS -DSPI_MASTER_SS"
-		)
+		) || exit 1
 
 		( \
 			run_test $POL $PHASE \
@@ -51,7 +52,7 @@ for POL in 0 1; do
 			simtop_no_write_$POL$PHASE 24 \
 			"../spi_master_no_write.v ../spi_slave_no_read.v" \
 			"-DSPI_MASTER_NO_WRITE -CFLAGS -DSPI_MASTER_NO_WRITE"
-		)
+		) || exit 1
 
 		( \
 			run_test $POL $PHASE \
@@ -60,7 +61,7 @@ for POL in 0 1; do
 			"../spi_master_ss_no_write.v ../spi_slave_no_read.v" \
 			"-DSPI_MASTER_NO_WRITE -CFLAGS -DSPI_MASTER_NO_WRITE
 			 -DSPI_MASTER_SS -CFLAGS -DSPI_MASTER_SS"
-		)
+		) || exit 1
 
 		( \
 			run_test $POL $PHASE \
@@ -68,7 +69,7 @@ for POL in 0 1; do
 			simtop_no_read_$POL$PHASE 24 \
 			"../spi_master_no_read.v ../spi_slave_no_write.v" \
 			"-DSPI_MASTER_NO_READ -CFLAGS -DSPI_MASTER_NO_READ"
-		)
+		) || exit 1
 
 		( \
 			run_test $POL $PHASE \
@@ -77,7 +78,7 @@ for POL in 0 1; do
 			"../spi_master_ss_no_read.v ../spi_slave_no_write.v" \
 			"-DSPI_MASTER_NO_READ -CFLAGS -DSPI_MASTER_NO_READ
 			 -DSPI_MASTER_SS -CFLAGS -DSPI_MASTER_SS"
-		)
+		) || exit 1
 
 	done
 done
diff --git a/tests/write_read.cpp b/tests/write_read.cpp
index 387b58a..74a94ce 100644
--- a/tests/write_read.cpp
+++ b/tests/write_read.cpp
@@ -3,6 +3,7 @@
 #include "Vsimtop.h"
 
 Vsimtop *sim;
+int return_value = 0;
 
 #ifdef SPI_MASTER_SS
 # define SET_SS(mod, v)
@@ -55,26 +56,25 @@ static void test_cross_transfer(unsigned m2s, unsigned s2m) {
 
 	if (sim->err) {
 		printf("slave error\n");
+		return_value = 1;
 	}
 
 #ifndef SPI_MASTER_NO_WRITE
 	if (sim->master_to_slave != sim->from_master) {
 		printf("(m2s) %lx != %lx\n", sim->master_to_slave, sim->from_master);
+		return_value = 1;
 	}
 #endif
 
 #ifndef SPI_MASTER_NO_READ
 	if (sim->slave_to_master != sim->from_slave) {
 		printf("(m2s) %lx != %lx\n", sim->slave_to_master, sim->from_slave);
+		return_value = 1;
 	}
 #endif
-
 }
 
 int main(int argc, char **argv) {
-	int r = 0;
-	(void)r;
-
 	Verilated::commandArgs(argc, argv);
 	Verilated::traceEverOn(true);
 
@@ -95,5 +95,5 @@ int main(int argc, char **argv) {
 
 	sim->final();
 	delete sim;
-	return r;
+	return return_value;
 }