selftests/nolibc: add a standalone test report macro

The run-user, run and rerun targets use the same test report script,
let's add a standalone test report macro for them.

This shrinks code lines and simplify the future maintainability.

Suggested-by: Willy Tarreau <w@1wt.eu>
Link: https://lore.kernel.org/lkml/ZIB792FtG6ibOudp@1wt.eu/
Signed-off-by: Zhangjin Wu <falcon@tinylab.org>
Signed-off-by: Willy Tarreau <w@1wt.eu>

diff --git a/tools/testing/selftests/nolibc/Makefile b/tools/testing/selftests/nolibc/Makefile
index 1b7b3c82f8add325367ddd47c80a215f1ae10ee1..262a9f21d1b4f256ceeadc0562dbafc02767ed37 100644 (file)
--- a/tools/testing/selftests/nolibc/Makefile
+++ b/tools/testing/selftests/nolibc/Makefile
@@ -84,6 +84,10 @@ CFLAGS  ?= -Os -fno-ident -fno-asynchronous-unwind-tables -std=c89 \
                $(CFLAGS_$(ARCH)) $(CFLAGS_STACKPROTECTOR)
 LDFLAGS := -s
 
+REPORT  ?= awk '/\[OK\][\r]*$$/{p++} /\[FAIL\][\r]*$$/{f++} /\[SKIPPED\][\r]*$$/{s++} \
+               END{ printf("%d test(s) passed, %d skipped, %d failed.", p, s, f); \
+               if (s+f > 0) printf(" See all results in %s\n", ARGV[1]); else print; }'
+
 help:
        @echo "Supported targets under selftests/nolibc:"
        @echo "  all          call the \"run\" target below"
@@ -131,10 +135,7 @@ libc-test: nolibc-test.c
 # qemu user-land test
 run-user: nolibc-test
        $(Q)qemu-$(QEMU_ARCH) ./nolibc-test > "$(CURDIR)/run.out" || :
-       $(Q)awk '/\[OK\][\r]*$$/{p++} /\[FAIL\][\r]*$$/{f++} /\[SKIPPED\][\r]*$$/{s++} \
-                END{ printf("%d test(s) passed, %d skipped, %d failed.", p, s, f); \
-                if (s+f > 0) printf(" See all results in %s\n", ARGV[1]); else print; }' \
-                $(CURDIR)/run.out
+       $(Q)$(REPORT) $(CURDIR)/run.out
 
 initramfs: nolibc-test
        $(QUIET_MKDIR)mkdir -p initramfs
@@ -150,18 +151,12 @@ kernel: initramfs
 # run the tests after building the kernel
 run: kernel
        $(Q)qemu-system-$(QEMU_ARCH) -display none -no-reboot -kernel "$(srctree)/$(IMAGE)" -serial stdio $(QEMU_ARGS) > "$(CURDIR)/run.out"
-       $(Q)awk '/\[OK\][\r]*$$/{p++} /\[FAIL\][\r]*$$/{f++} /\[SKIPPED\][\r]*$$/{s++} \
-                END{ printf("%d test(s) passed, %d skipped, %d failed.", p, s, f); \
-                if (s+f > 0) printf(" See all results in %s\n", ARGV[1]); else print; }' \
-                $(CURDIR)/run.out
+       $(Q)$(REPORT) $(CURDIR)/run.out
 
 # re-run the tests from an existing kernel
 rerun:
        $(Q)qemu-system-$(QEMU_ARCH) -display none -no-reboot -kernel "$(srctree)/$(IMAGE)" -serial stdio $(QEMU_ARGS) > "$(CURDIR)/run.out"
-       $(Q)awk '/\[OK\][\r]*$$/{p++} /\[FAIL\][\r]*$$/{f++} /\[SKIPPED\][\r]*$$/{s++} \
-                END{ printf("%d test(s) passed, %d skipped, %d failed.", p, s, f); \
-                if (s+f > 0) printf(" See all results in %s\n", ARGV[1]); else print; }' \
-                $(CURDIR)/run.out
+       $(Q)$(REPORT) $(CURDIR)/run.out
 
 clean:
        $(call QUIET_CLEAN, sysroot)