From 798f35fc883c8beb3fe2fca2e00c697e2d307223 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Tue, 17 Sep 2024 21:30:28 +0200 Subject: tests/qemu-iotests/testenv: Use the "virt" machine for or1k When compiling QEMU just with "--target-list=or1k-softmmu", there are 8 iotests failing that try to use PCI devices - but the default or1k machine does not have a PCI bus. The "virt" machine is better suited for running the iotests than the or1k default machine since it provides PCI and thus e.g. support for virtio-blk and virtio-scsi, too. With this change, there are no failing iotests anymore when using the qemu-system-or1k binary for running the tests. Signed-off-by: Thomas Huth Reviewed-by: Richard Henderson Reviewed-by: Michael Tokarev Signed-off-by: Michael Tokarev --- tests/qemu-iotests/testenv.py | 1 + 1 file changed, 1 insertion(+) (limited to 'tests/qemu-iotests/testenv.py') diff --git a/tests/qemu-iotests/testenv.py b/tests/qemu-iotests/testenv.py index c8848f2ec2..0b32eec119 100644 --- a/tests/qemu-iotests/testenv.py +++ b/tests/qemu-iotests/testenv.py @@ -240,6 +240,7 @@ class TestEnv(ContextManager['TestEnv']): ('aarch64', 'virt'), ('avr', 'mega2560'), ('m68k', 'virt'), + ('or1k', 'virt'), ('riscv32', 'virt'), ('riscv64', 'virt'), ('rx', 'gdbsim-r5f562n8'), -- cgit 1.4.1 From fd7294335c9ce7f9cb5e4b5e3b3148d9e8cce3bd Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Tue, 17 Sep 2024 21:43:50 +0200 Subject: tests/qemu-iotests/testenv: Use the "r2d" machine for sh4/sh4eb Commit 0ea0538fae516f9b4 removed the default machine of the sh4 binaries, so a lot of iotests are failing now without such a default machine. Teach the iotest harness to use the "r2d" machine instead to fix this problem. Signed-off-by: Thomas Huth Signed-off-by: Michael Tokarev --- tests/qemu-iotests/testenv.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'tests/qemu-iotests/testenv.py') diff --git a/tests/qemu-iotests/testenv.py b/tests/qemu-iotests/testenv.py index 0b32eec119..6326e46b7b 100644 --- a/tests/qemu-iotests/testenv.py +++ b/tests/qemu-iotests/testenv.py @@ -244,6 +244,8 @@ class TestEnv(ContextManager['TestEnv']): ('riscv32', 'virt'), ('riscv64', 'virt'), ('rx', 'gdbsim-r5f562n8'), + ('sh4', 'r2d'), + ('sh4eb', 'r2d'), ('tricore', 'tricore_testboard') ) for suffix, machine in machine_map: -- cgit 1.4.1