The RISC-V suite builds and installs its subdirectories in shell loops
whose status is that of the last subdirectory. A failure in any other
subdirectory is lost, while a failure in the last one fails "make all"
and, through "install: all", drops the installation of every other
RISC-V test as well. FORCE_TARGETS has no effect on the loops either.
Make each loop fail only when no subdirectory succeeds, which matches
how the top-level selftests Makefile treats its targets, and stop at the
first failure when FORCE_TARGETS is set. When a build report is
requested, record each subdirectory as riscv/<subdir> so that a
partially built suite is visible even though make succeeds. Default
OUTPUT to the current directory, as the arm64 suite does, so that the
loops also work when the suite is built directly.
Fixes: 287dcc2b0c83 ("selftests: Test the new RISC-V hwprobe interface")
Signed-off-by: Sasha Levin <[email protected]>
---
tools/testing/selftests/riscv/Makefile | 39 +++++++++++++++++++-------
1 file changed, 29 insertions(+), 10 deletions(-)
diff --git a/tools/testing/selftests/riscv/Makefile
b/tools/testing/selftests/riscv/Makefile
index 5671b4405a129..52d1228be8d03 100644
--- a/tools/testing/selftests/riscv/Makefile
+++ b/tools/testing/selftests/riscv/Makefile
@@ -20,21 +20,35 @@ CFLAGS += -I$(top_srcdir)/tools/testing/selftests/
CFLAGS += $(KHDR_INCLUDES)
+OUTPUT ?= $(CURDIR)
+
export CFLAGS
export top_srcdir
+include $(top_srcdir)/tools/testing/selftests/build_report.mk
+
all:
- @for DIR in $(RISCV_SUBTARGETS); do \
+ @ret=$(if $(RISCV_SUBTARGETS),1,0); \
+ for DIR in $(RISCV_SUBTARGETS); do \
BUILD_TARGET=$(OUTPUT)/$$DIR; \
- mkdir -p $$BUILD_TARGET; \
- $(MAKE) OUTPUT=$$BUILD_TARGET -C $$DIR $@; \
- done
+ mkdir -p $$BUILD_TARGET && \
+ $(MAKE) OUTPUT=$$BUILD_TARGET -C $$DIR $@; \
+ status=$$?; \
+ $(call ksft_record_build_status,all,riscv/$$DIR); \
+ $(if $(FORCE_TARGETS),[ $$status -eq 0 ] || exit $$status;) \
+ [ $$status -eq 0 ] && ret=0; \
+ done; exit $$ret
install: all
- @for DIR in $(RISCV_SUBTARGETS); do \
+ @ret=$(if $(RISCV_SUBTARGETS),1,0); \
+ for DIR in $(RISCV_SUBTARGETS); do \
BUILD_TARGET=$(OUTPUT)/$$DIR; \
- $(MAKE) OUTPUT=$$BUILD_TARGET -C $$DIR $@; \
- done
+ $(MAKE) OUTPUT=$$BUILD_TARGET -C $$DIR $@; \
+ status=$$?; \
+ $(call ksft_record_build_status,install,riscv/$$DIR); \
+ $(if $(FORCE_TARGETS),[ $$status -eq 0 ] || exit $$status;) \
+ [ $$status -eq 0 ] && ret=0; \
+ done; exit $$ret
run_tests: all
@for DIR in $(RISCV_SUBTARGETS); do \
@@ -44,10 +58,15 @@ run_tests: all
# Avoid any output on non riscv on emit_tests
emit_tests:
- @for DIR in $(RISCV_SUBTARGETS); do \
+ @ret=$(if $(RISCV_SUBTARGETS),1,0); \
+ for DIR in $(RISCV_SUBTARGETS); do \
BUILD_TARGET=$(OUTPUT)/$$DIR; \
- $(MAKE) OUTPUT=$$BUILD_TARGET -C $$DIR $@; \
- done
+ $(MAKE) OUTPUT=$$BUILD_TARGET -C $$DIR $@; \
+ status=$$?; \
+ $(call ksft_record_build_status,install,riscv/$$DIR); \
+ $(if $(FORCE_TARGETS),[ $$status -eq 0 ] || exit $$status;) \
+ [ $$status -eq 0 ] && ret=0; \
+ done; exit $$ret
clean:
@for DIR in $(RISCV_SUBTARGETS); do \
--
2.53.0
