From: "Paul E. McKenney" <[email protected]>
To: [email protected]
Cc: [email protected], [email protected], [email protected],
Willy Tarreau <[email protected]>,
"Paul E . McKenney" <[email protected]>
Subject: [PATCH nolibc 15/18] selftests/nolibc: add a "run" target to start the kernel in QEMU
Date: Wed, 31 Aug 2022 11:21:45 -0700 [thread overview]
Message-ID: <[email protected]> (raw)
In-Reply-To: <20220831182113.GA2697286@paulmck-ThinkPad-P17-Gen-1>
From: Willy Tarreau <[email protected]>
The "run" target will build the kernel and start it in QEMU. The
"rerun" target will not have the kernel dependency and will just try
to start QEMU. The QEMU architecture used to start the kernel is
derived from the configured ARCH. This might need to be improved
for archs which include different variants under the same name
(mips vs mipsel, +/-64, riscv32 vs riscv64). This could be tested
for i386, x86, arm, arm64, mips and riscv (the later two reporting
issues on some tests).
It is possible to pass a test specification for nolibc-test in the TEST
variable, which will be passed as-is as NOLIBC_TEST.
On success, the number of successful tests is printed. On failure, failed
lines are individually printed.
Signed-off-by: Willy Tarreau <[email protected]>
Signed-off-by: Paul E. McKenney <[email protected]>
---
tools/testing/selftests/nolibc/Makefile | 33 +++++++++++++++++++++++++
1 file changed, 33 insertions(+)
diff --git a/tools/testing/selftests/nolibc/Makefile b/tools/testing/selftests/nolibc/Makefile
index c104719eae8b8..7c1f5360f454e 100644
--- a/tools/testing/selftests/nolibc/Makefile
+++ b/tools/testing/selftests/nolibc/Makefile
@@ -31,6 +31,27 @@ DEFCONFIG_mips = malta_defconfig
DEFCONFIG_riscv = defconfig
DEFCONFIG = $(DEFCONFIG_$(ARCH))
+# optional tests to run (default = all)
+TEST =
+
+# QEMU_ARCH: arch names used by qemu
+QEMU_ARCH_i386 = i386
+QEMU_ARCH_x86 = x86_64
+QEMU_ARCH_arm64 = aarch64
+QEMU_ARCH_arm = arm
+QEMU_ARCH_mips = mipsel # works with malta_defconfig
+QEMU_ARCH_riscv = riscv64
+QEMU_ARCH = $(QEMU_ARCH_$(ARCH))
+
+# QEMU_ARGS : some arch-specific args to pass to qemu
+QEMU_ARGS_i386 = -M pc -append "console=ttyS0,9600 i8042.noaux panic=-1 $(TEST:%=NOLIBC_TEST=%)"
+QEMU_ARGS_x86 = -M pc -append "console=ttyS0,9600 i8042.noaux panic=-1 $(TEST:%=NOLIBC_TEST=%)"
+QEMU_ARGS_arm64 = -M virt -cpu cortex-a53 -append "panic=-1 $(TEST:%=NOLIBC_TEST=%)"
+QEMU_ARGS_arm = -M virt -append "panic=-1 $(TEST:%=NOLIBC_TEST=%)"
+QEMU_ARGS_mips = -M malta -append "panic=-1 $(TEST:%=NOLIBC_TEST=%)"
+QEMU_ARGS_riscv = -M virt -append "console=ttyS0 panic=-1 $(TEST:%=NOLIBC_TEST=%)"
+QEMU_ARGS = $(QEMU_ARGS_$(ARCH))
+
# OUTPUT is only set when run from the main makefile, otherwise
# it defaults to this nolibc directory.
OUTPUT ?= $(CURDIR)/
@@ -61,8 +82,20 @@ defconfig:
kernel: initramfs
$(Q)$(MAKE) -C $(srctree) ARCH=$(ARCH) CC=$(CC) CROSS_COMPILE=$(CROSS_COMPILE) $(IMAGE_NAME) CONFIG_INITRAMFS_SOURCE=$(CURDIR)/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)grep -w FAIL "$(CURDIR)/run.out" && echo "See all results in $(CURDIR)/run.out" || echo "$$(grep -c ^[0-9].*OK $(CURDIR)/run.out) test(s) passed."
+
+# 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)grep -w FAIL "$(CURDIR)/run.out" && echo "See all results in $(CURDIR)/run.out" || echo "$$(grep -c ^[0-9].*OK $(CURDIR)/run.out) test(s) passed."
+
clean:
$(call QUIET_CLEAN, nolibc-test)
$(Q)rm -f nolibc-test
$(call QUIET_CLEAN, initramfs)
$(Q)rm -rf initramfs
+ $(call QUIET_CLEAN, run.out)
+ $(Q)rm -rf run.out
--
2.31.1.189.g2e36527f23
next prev parent reply other threads:[~2022-08-31 18:21 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-31 18:21 [PATCH nolibc 0/18] nolibc updates for v6.1 Paul E. McKenney
2022-08-31 18:21 ` [PATCH nolibc 01/18] tools/nolibc: make argc 32-bit in riscv startup code Paul E. McKenney
2022-08-31 18:21 ` [PATCH rcu 1/2] torture: Optionally flush printk() buffers before powering off Paul E. McKenney
2022-09-01 9:12 ` John Ogness
2022-09-01 10:17 ` Paul E. McKenney
2022-08-31 18:21 ` [PATCH rcu 2/2] rcutorture: Use the barrier operation specified by cur_ops Paul E. McKenney
2022-08-31 18:21 ` [PATCH nolibc 02/18] tools/nolibc: fix build warning in sys_mmap() when my_syscall6 is not defined Paul E. McKenney
2022-08-31 18:21 ` [PATCH nolibc 03/18] tools/nolibc: make sys_mmap() automatically use the right __NR_mmap definition Paul E. McKenney
2022-08-31 18:21 ` [PATCH nolibc 04/18] selftests/nolibc: add basic infrastructure to ease creation of nolibc tests Paul E. McKenney
2022-08-31 18:21 ` [PATCH nolibc 05/18] selftests/nolibc: support a test definition format Paul E. McKenney
2022-08-31 18:21 ` [PATCH nolibc 06/18] selftests/nolibc: implement a few tests for various syscalls Paul E. McKenney
2022-08-31 18:21 ` [PATCH nolibc 07/18] selftests/nolibc: add a few tests for some libc functions Paul E. McKenney
2022-08-31 18:21 ` [PATCH nolibc 08/18] selftests/nolibc: exit with poweroff on success when getpid() == 1 Paul E. McKenney
2022-08-31 18:21 ` [PATCH nolibc 09/18] selftests/nolibc: on x86, support exiting with isa-debug-exit Paul E. McKenney
2022-08-31 18:21 ` [PATCH nolibc 10/18] selftests/nolibc: recreate and populate /dev and /proc if missing Paul E. McKenney
2022-08-31 18:21 ` [PATCH nolibc 11/18] selftests/nolibc: condition some tests on /proc existence Paul E. McKenney
2022-08-31 18:21 ` [PATCH nolibc 12/18] selftests/nolibc: support glibc as well Paul E. McKenney
2022-08-31 18:21 ` [PATCH nolibc 13/18] selftests/nolibc: add a "kernel" target to build the kernel with the initramfs Paul E. McKenney
2022-08-31 18:21 ` [PATCH nolibc 14/18] selftests/nolibc: add a "defconfig" target Paul E. McKenney
2022-08-31 18:21 ` Paul E. McKenney [this message]
2022-08-31 18:21 ` [PATCH nolibc 16/18] selftests/nolibc: "sysroot" target installs a local copy of the sysroot Paul E. McKenney
2022-08-31 18:21 ` [PATCH nolibc 17/18] selftests/nolibc: add a "help" target Paul E. McKenney
2022-08-31 18:21 ` [PATCH nolibc 18/18] selftests/nolibc: Avoid generated files being committed Paul E. McKenney
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox