qemu-riscv: Consolidate Makefile.test into main Makefile.

dpgeorge · dpgeorge · commit d2de1bb81b34 · 2024-08-01T13:22:14.000+10:00
Signed-off-by: Damien George &lt;damien@micropython.org&gt;
diff --git a/ports/qemu-riscv/Makefile b/ports/qemu-riscv/Makefile
@@ -1,3 +1,5 @@
+TESTS_PROFILE = $(dir $(abspath $(firstword $(MAKEFILE_LIST))))/tests_profile.txt
+
 include ../../py/mkenv.mk
 -include mpconfigport.mk
 
@@ -86,6 +88,7 @@ SRC_RUN_C = \
 SRC_TEST_C = \
 	test_main.c \
 	lib/tinytest/tinytest.c \
+	shared/upytesthelper/upytesthelper.c \
 
 LIB_SRC_C += $(SRC_LIB_LIBM_C)
 LIB_SRC_C += $(SRC_LIB_LIBM_SQRT_SW_C)
@@ -125,4 +128,27 @@ $(BUILD)/firmware.elf: $(LDSCRIPT) $(ALL_OBJ_RUN)
 	$(Q)$(LD) $(LDFLAGS) -o $@ $(ALL_OBJ_RUN) $(LIBS)
 	$(Q)$(SIZE) $@
 
+$(BUILD)/firmware-test.elf: $(LDSCRIPT) $(ALL_OBJ_TEST)
+	$(Q)$(LD) $(LDFLAGS) -o $@ $(ALL_OBJ_TEST) $(LIBS)
+	$(Q)$(SIZE) $@
+
+$(BUILD)/test_main.o: $(BUILD)/genhdr/tests.h
+
+.PHONY: $(BUILD)/genhdr/tests.h
+$(BUILD)/genhdr/tests.h:
+	(cd $(TOP)/tests; ./run-tests.py --target=qemu-riscv --write-exp)
+	$(Q)echo "Generating $@";(cd $(TOP)/tests; ../tools/tinytest-codegen.py --profile $(TESTS_PROFILE) $(addprefix --exclude ,$(TESTS_EXCLUDE))) > $@
+
+$(BUILD)/lib/tinytest/tinytest.o: CFLAGS += -DNO_FORKING
+
+# Note: Using timeout(1) to handle cases where qemu hangs (e.g. this can happen with alignment errors).
+test: $(BUILD)/firmware-test.elf
+	timeout --foreground -k 5s 60s qemu-system-riscv32 -machine $(BOARD) -bios none $(QEMU_EXTRA) -nographic -monitor null -semihosting -kernel $< > $(BUILD)/console.out
+	$(Q)tail -n2 $(BUILD)/console.out
+	$(Q)tail -n1 $(BUILD)/console.out | grep -q "status: 0"
+
+# `make debugtest` will block QEMU until a debugger is connected to port 1234.
+debugtest: $(BUILD)/firmware-test.elf
+	qemu-system-riscv32 -machine $(BOARD) -bios none $(QEMU_EXTRA) -nographic -monitor null -semihosting -serial mon:stdio -S -s -kernel $<
+
 include $(TOP)/py/mkrules.mk
diff --git a/ports/qemu-riscv/Makefile.test b/ports/qemu-riscv/Makefile.test
diff --git a/ports/qemu-riscv/README.md b/ports/qemu-riscv/README.md
@@ -26,4 +26,4 @@ Linux distribution's package manager, or independently packaged ones like
 
 To build and run the image with builtin testsuite:
 
-    make -f Makefile.test test
+    make test
diff --git a/ports/qemu-riscv/mpconfigport.h b/ports/qemu-riscv/mpconfigport.h
@@ -24,6 +24,7 @@
  * THE SOFTWARE.
  */
 
+#include <stddef.h>
 #include <stdint.h>
 
 // options to control how MicroPython is built
@@ -70,8 +71,7 @@ typedef long mp_off_t;
 // We need to provide a declaration/definition of alloca()
 #include <alloca.h>
 
-#ifdef TEST
-#include "shared/upytesthelper/upytesthelper.h"
-#undef MP_PLAT_PRINT_STRN
-#define MP_PLAT_PRINT_STRN(str, len) upytest_output(str, len)
-#endif
+// All printing is passed through a custom function to check test output.
+#define MP_PLAT_PRINT_STRN(str, len) qemu_print_strn(str, len)
+
+void qemu_print_strn(const char *str, size_t len);
diff --git a/ports/qemu-riscv/test_main.c b/ports/qemu-riscv/test_main.c
@@ -33,6 +33,7 @@
 #include "py/gc.h"
 #include "py/mperrno.h"
 #include "shared/runtime/gchelper.h"
+#include "shared/upytesthelper/upytesthelper.h"
 #include "lib/tinytest/tinytest.h"
 #include "lib/tinytest/tinytest_macros.h"
 
@@ -64,3 +65,7 @@ void nlr_jump_fail(void *val) {
     printf("uncaught NLR\n");
     exit(1);
 }
+
+void qemu_print_strn(const char *str, size_t len) {
+    upytest_output(str, len);
+}
diff --git a/tools/ci.sh b/tools/ci.sh
@@ -278,8 +278,7 @@ function ci_qemu_riscv_build {
     make ${MAKEOPTS} -C ports/qemu-riscv submodules
     make ${MAKEOPTS} -C ports/qemu-riscv
     make ${MAKEOPTS} -C ports/qemu-riscv clean
-    make ${MAKEOPTS} -C ports/qemu-riscv -f Makefile.test submodules
-    make ${MAKEOPTS} -C ports/qemu-riscv -f Makefile.test test
+    make ${MAKEOPTS} -C ports/qemu-riscv test
 }
 
 ########################################################################################

Original file line number	Diff line number	Diff line change
`@@ -26,4 +26,4 @@ Linux distribution's package manager, or independently packaged ones like`
`26`	`26`
`27`	`27`	`To build and run the image with builtin testsuite:`
`28`	`28`
`29`		`- make -f Makefile.test test`
	`29`	`+ make test`
Original file line number	Diff line number	Diff line change
`@@ -278,8 +278,7 @@ function ci_qemu_riscv_build {`
`278`	`278`	`make ${MAKEOPTS} -C ports/qemu-riscv submodules`
`279`	`279`	`make ${MAKEOPTS} -C ports/qemu-riscv`
`280`	`280`	`make ${MAKEOPTS} -C ports/qemu-riscv clean`
`281`		`- make ${MAKEOPTS} -C ports/qemu-riscv -f Makefile.test submodules`
`282`		`- make ${MAKEOPTS} -C ports/qemu-riscv -f Makefile.test test`
	`281`	`+ make ${MAKEOPTS} -C ports/qemu-riscv test`
`283`	`282`	`}`
`284`	`283`
`285`	`284`	`########################################################################################`