public inbox for kvm@vger.kernel.org
 help / color / mirror / Atom feed
From: Andrew Jones <andrew.jones@linux.dev>
To: kvm@vger.kernel.org, kvm-riscv@lists.infradead.org,
	kvmarm@lists.linux.dev
Cc: ajones@ventanamicro.com, anup@brainfault.org,
	atishp@atishpatra.org, pbonzini@redhat.com, thuth@redhat.com,
	alexandru.elisei@arm.com, eric.auger@redhat.com
Subject: [kvm-unit-tests PATCH v2 07/24] riscv: Add run script and unittests.cfg
Date: Fri, 26 Jan 2024 15:23:32 +0100	[thread overview]
Message-ID: <20240126142324.66674-33-andrew.jones@linux.dev> (raw)
In-Reply-To: <20240126142324.66674-26-andrew.jones@linux.dev>

With a run script and a unittests.cfg file we can now run

 $ KVM_UNIT_TESTS_ENV=test-env ./run_tests.sh

where test-env has the environment variables needed for both tests.

Note, to change the SBI implementation under test, for example to
RustSBI, QEMU needs the -bios parameter. The full command line
would be

  qemu-system-riscv64 -nographic -M virt -cpu rv64 \
      -kernel riscv/sbi.flat \
      -bios $PATH_TO_RUSTSBI

and with the run script, it's

  SBI_IMPL="-bios $PATH_TO_RUSTSBI" ./run_tests.sh -g sbi

(note the '-g sbi' to only run the SBI test group)

Finally, with the addition of the run script, 'make standalone' now
also works.

Signed-off-by: Andrew Jones <andrew.jones@linux.dev>
Acked-by: Thomas Huth <thuth@redhat.com>
---
 riscv/run           | 41 +++++++++++++++++++++++++++++++++++++++++
 riscv/unittests.cfg | 37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 78 insertions(+)
 create mode 100755 riscv/run
 create mode 100644 riscv/unittests.cfg

diff --git a/riscv/run b/riscv/run
new file mode 100755
index 000000000000..cbe5dd792dcd
--- /dev/null
+++ b/riscv/run
@@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+
+if [ -z "$KUT_STANDALONE" ]; then
+	if [ ! -f config.mak ]; then
+		echo "run ./configure && make first. See ./configure -h"
+		exit 2
+	fi
+	source config.mak
+	source scripts/arch-run.bash
+fi
+
+# Allow user overrides of some config.mak variables
+processor=$PROCESSOR_OVERRIDE
+firmware=$FIRMWARE_OVERRIDE
+
+[ "$PROCESSOR" = "$ARCH" ] && PROCESSOR="max"
+: "${processor:=$PROCESSOR}"
+: "${firmware:=$FIRMWARE}"
+[ "$firmware" ] && firmware="-bios $firmware"
+
+set_qemu_accelerator || exit $?
+[ "$ACCEL" = "kvm" ] && QEMU_ARCH=$HOST
+acc="-accel $ACCEL$ACCEL_PROPS"
+
+qemu=$(search_qemu_binary) || exit $?
+if ! $qemu -machine '?' | grep -q 'RISC-V VirtIO board'; then
+	echo "$qemu doesn't support mach-virt ('-machine virt'). Exiting."
+	exit 2
+fi
+mach='-machine virt'
+
+command="$qemu -nodefaults -nographic -serial mon:stdio"
+command+=" $mach $acc $firmware -cpu $processor "
+command="$(migration_cmd) $(timeout_cmd) $command"
+
+if [ "$EFI_RUN" = "y" ]; then
+	ENVIRON_DEFAULT=n run_qemu_status $command "$@"
+else
+	# We return the exit code via stdout, not via the QEMU return code
+	run_qemu_status $command -kernel "$@"
+fi
diff --git a/riscv/unittests.cfg b/riscv/unittests.cfg
new file mode 100644
index 000000000000..5a23bed9cdd6
--- /dev/null
+++ b/riscv/unittests.cfg
@@ -0,0 +1,37 @@
+##############################################################################
+# unittest configuration
+#
+# [unittest_name]
+# file = <name>.flat		# Name of the flat file to be used.
+# smp  = <num>			# Number of processors the VM will use
+#				# during this test. Use $MAX_SMP to use
+#				# the maximum the host supports. Defaults
+#				# to one.
+# extra_params = -append <params...>	# Additional parameters used.
+# arch = riscv32|riscv64		# Select one if the test case is
+#					# specific to only one.
+# groups = <group_name1> <group_name2> ...	# Used to identify test cases
+#						# with run_tests -g ...
+#						# Specify group_name=nodefault
+#						# to have test not run by
+#						# default
+# accel = kvm|tcg		# Optionally specify if test must run with
+#				# kvm or tcg. If not specified, then kvm will
+#				# be used when available.
+# timeout = <duration>		# Optionally specify a timeout.
+# check = <path>=<value> # check a file for a particular value before running
+#                        # a test. The check line can contain multiple files
+#                        # to check separated by a space but each check
+#                        # parameter needs to be of the form <path>=<value>
+##############################################################################
+
+[selftest]
+file = selftest.flat
+smp = 16
+extra_params = -append 'foo bar baz'
+groups = selftest
+
+# Set $FIRMWARE_OVERRIDE to /path/to/firmware to select the SBI implementation.
+[sbi]
+file = sbi.flat
+groups = sbi
-- 
2.43.0


  parent reply	other threads:[~2024-01-26 14:23 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-26 14:23 [kvm-unit-tests PATCH v2 00/24] Introduce RISC-V Andrew Jones
2024-01-26 14:23 ` [kvm-unit-tests PATCH v2 01/24] configure: Add ARCH_LIBDIR Andrew Jones
2024-02-01  8:29   ` Eric Auger
2024-01-26 14:23 ` [kvm-unit-tests PATCH v2 02/24] riscv: Initial port, hello world Andrew Jones
2024-02-01  8:29   ` Eric Auger
2024-02-01 14:07     ` Andrew Jones
2024-01-26 14:23 ` [kvm-unit-tests PATCH v2 03/24] arm/arm64: Move cpumask.h to common lib Andrew Jones
2024-02-01  8:29   ` Eric Auger
2024-01-26 14:23 ` [kvm-unit-tests PATCH v2 04/24] arm/arm64: Share cpu online, present and idle masks Andrew Jones
2024-02-01  8:29   ` Eric Auger
2024-01-26 14:23 ` [kvm-unit-tests PATCH v2 05/24] riscv: Add DT parsing Andrew Jones
2024-01-26 14:23 ` [kvm-unit-tests PATCH v2 06/24] riscv: Add initial SBI support Andrew Jones
2024-01-26 14:23 ` Andrew Jones [this message]
2024-01-26 14:23 ` [kvm-unit-tests PATCH v2 08/24] riscv: Add riscv32 support Andrew Jones
2024-02-01 15:24   ` Andrew Jones
2024-01-26 14:23 ` [kvm-unit-tests PATCH v2 09/24] riscv: Add exception handling Andrew Jones
2024-01-26 14:23 ` [kvm-unit-tests PATCH v2 10/24] riscv: Add backtrace support Andrew Jones
2024-01-26 14:23 ` [kvm-unit-tests PATCH v2 11/24] arm/arm64: Generalize wfe/sev names in smp.c Andrew Jones
2024-02-01  9:22   ` Eric Auger
2024-01-26 14:23 ` [kvm-unit-tests PATCH v2 12/24] arm/arm64: Remove spinlocks from on_cpu_async Andrew Jones
2024-02-01  9:34   ` Eric Auger
2024-01-26 14:23 ` [kvm-unit-tests PATCH v2 13/24] arm/arm64: Share on_cpus Andrew Jones
2024-02-01  9:36   ` Eric Auger
2024-01-26 14:23 ` [kvm-unit-tests PATCH v2 14/24] riscv: Compile with march Andrew Jones
2024-01-26 14:23 ` [kvm-unit-tests PATCH v2 15/24] riscv: Add SMP support Andrew Jones
2024-01-26 14:23 ` [kvm-unit-tests PATCH v2 16/24] arm/arm64: Share memregions Andrew Jones
2024-02-01 12:03   ` Eric Auger
2024-02-01 14:21     ` Andrew Jones
2024-02-01 17:46       ` Eric Auger
2024-01-26 14:23 ` [kvm-unit-tests PATCH v2 17/24] riscv: Populate memregions and switch to page allocator Andrew Jones
2024-01-26 14:23 ` [kvm-unit-tests PATCH v2 18/24] riscv: Add MMU support Andrew Jones
2024-01-26 14:23 ` [kvm-unit-tests PATCH v2 19/24] riscv: Enable the MMU in secondaries Andrew Jones
2024-01-26 14:23 ` [kvm-unit-tests PATCH v2 20/24] riscv: Enable vmalloc Andrew Jones
2024-01-26 14:23 ` [kvm-unit-tests PATCH v2 21/24] lib: Add strcasecmp and strncasecmp Andrew Jones
2024-02-01  9:45   ` Eric Auger
2024-01-26 14:23 ` [kvm-unit-tests PATCH v2 22/24] riscv: Add isa string parsing Andrew Jones
2024-01-26 14:23 ` [kvm-unit-tests PATCH v2 23/24] gitlab-ci: Add riscv64 tests Andrew Jones
2024-01-26 14:23 ` [kvm-unit-tests PATCH v2 24/24] MAINTAINERS: Add riscv Andrew Jones
2024-02-02 14:22 ` [kvm-unit-tests PATCH v2 00/24] Introduce RISC-V Andrew Jones

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 \
    --in-reply-to=20240126142324.66674-33-andrew.jones@linux.dev \
    --to=andrew.jones@linux.dev \
    --cc=ajones@ventanamicro.com \
    --cc=alexandru.elisei@arm.com \
    --cc=anup@brainfault.org \
    --cc=atishp@atishpatra.org \
    --cc=eric.auger@redhat.com \
    --cc=kvm-riscv@lists.infradead.org \
    --cc=kvm@vger.kernel.org \
    --cc=kvmarm@lists.linux.dev \
    --cc=pbonzini@redhat.com \
    --cc=thuth@redhat.com \
    /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